am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev

* commit '69fbc3c089e3399ebd94cc3a7ba846f426a7b32d':
  Revert "Fix for bug 6050753."