This reverts commit 12abdeb3c7bffbc7c07b913595f6ea2cb66154d1. Change-Id: I938deddf5f294127f87a0e70f940fe5b9a85e0b2