This reverts commit 7bee55d9258c67de922c656e2428522c6f9b36da. Change-Id: I5806a3923bc8bed37dafd24d1ccef7486d4a06f3