This reverts commit 1a937b04e6. Bug: 20641986 Change-Id: I035d945d1561e5fc7c914aa9362635f763c83cfd
1a937b04e6