am 772ddc0c: am fd4df469: Merge "Remove workaround for bug that was fixed a while ago." into jb-dev

* commit '772ddc0cf28625964435edc5e86048e353c425fa':
  Remove workaround for bug that was fixed a while ago.