This reverts commit bcf6441e61725a2e6c04d03de43d209311da9d3a. Change-Id: I8b556dfaeb45434e194503fe5ae77e744637f6c2