This partially reverts commit 40618ded. Bug: 121271714 Change-Id: Iabd5f527e8660d929b2e58a90e09666884a0bc6a