am efaf8a3d: remove work around for bug 14891460. Bug: 14895464

* commit 'efaf8a3dcde8158f50e5db36a7e81207b9978863':
  remove work around for bug 14891460. Bug: 14895464