This reverts commit 512c132f49fc6e8e4fc119f4cf167d33b2393509. Change-Id: Iac381dfebcfe42f0468569eb2395ebeb97a95887