This reverts commit 7d4e6ee4cdb0ae6b5245f7a0b653f15879e13b8e. Change-Id: I3f0b88e12f1e8d87bbdecc0f045db2ba002ede03