This reverts commit 944268f2. Reason for revert: Regression Bug: 185789867 Change-Id: Ibae960a7aa076593dc57c60e13addf8b68e65dc1