This reverts commit afb45bba. Bug: 32839232 Fixes: 62424393 Change-Id: Ifaa0176e18100ec85b8c81268a26fb16ffe9b5f3