f78ba72379
This reverts commit 04fb7ee44c.
Reason for revert: This wasn't the right fix.
Bug: 179274888
Change-Id: Ic9aaf2b43252533837206cc82ac5fd1f2d7297f8