am fbe89ec6: Revert "Fix bug 2025765."

Merge commit 'fbe89ec6404978da7899b944d989dd9f50a468b5'

* commit 'fbe89ec6404978da7899b944d989dd9f50a468b5':
  Revert "Fix bug 2025765."