This reverts commit 3b8b07c8. Bug: 32668621 Test: this is a revert, no original tests Change-Id: I893025f32423aed3fe15a64c22753d24aafc4e65