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

* commit 'dcfe6ceef05c1566a8fc80b758b830c39df01bbd':
  Revert "Revert "Fix for bug 6050753.""