This reverts commit 97449fa3. Bug: 33034458 Bug: 33032977 Bug: 27856974 Change-Id: If913e587ce4a48b9ed1c7c0a811bc39ce4e31d3c