a798be2ff5
This reverts commit 749b2b8493.
Reason for revert: Causing tests to fail b/246972374
Change-Id: I9fc1f6d2e924f4ac5484c6674fd0adf49d04536f