This reverts commit 2b8bcfe5b7. Change-Id: Ifc4e9aaccb54e065a36380710694cd6e4d347636
2b8bcfe5b7
40bbf929