This reverts commit 84a8bb80. Bug: 77306455 Test: manual Change-Id: Ied14258726d71262642f8d72db5ee11ea671836b