This reverts commit e2a04b3ea4. Bug: 73123786 Change-Id: I1f09893fb3c68650340495f2833eb678099a895f
e2a04b3ea4