This reverts commit 0a202643. Bug: 63092414, 37434614 Change-Id: I6b3e190b5107e0516ade0c93b586dfbdde00c9c1