This reverts commit 84980c7a. Bug: 33895226 Bug: 30984614 Change-Id: I2652e77512bc870190e2172a629abac9341b2c4f