am 6868d6f3: Revert "Revert "Fix for bug 6050753.""

* commit '6868d6f349610c15256471cc3d5fa708cbfd5f1d':
  Revert "Revert "Fix for bug 6050753.""