This is causing build breakage. This reverts commit 0c7140ee. Change-Id: Id0b058b425827fcd926616641e6ffb491983e808