This reverts commit 7678aedd. Bug: 30051184, 29746499 Change-Id: Ibd8bc2771d67c4db61c82dcc8a569eb8adfef8de