This reverts commit bff91464a2c38ed4ed0d3aa537d24372a6dd984a. Change-Id: I84c07c9b2214a2d59cf35d9f0ee2deb5e838caf8