This reverts commit 9f548b00dcdd89e8d557223b8b99269ca7362c2e. Change-Id: If0081fa34333339e36f9e8b9a34a2e3a84e4638f