This reverts commit 1c6c51d9. Bug: 31098727 Change-Id: I9704e406dde2055536c68481b2cb1c45e8085762 Test: `make`