This reverts commit 25562b842e0f67101c5e901090857b3f06cc4cbe. Change-Id: I48496e7d9649b3d7d68cc2c992332e018da263b9