This reverts commit 698b4463. (cherry picked from commit 4d3981c7) Change-Id: I7245bc08ebb95c12e7cc71b97edf9ca11ffbdf61