This reverts commit 1dc510eb5bc7f279002a3479f24761f08cc390f7. Change-Id: I12ea8275369cbdc4e95b21c7f5d51b4f0e5da7b2