This reverts commit adc0b87ec2. Bug:73134570 Change-Id: I9e652245e7661eb7a34dadb5f363a08bc8c9e57e
adc0b87ec2