Revert to 5a6a0faa2aafdf94fc60161f065a0029e5560346

Change-Id: I9a5d51aa4ad9e2d532d7c6ca6ba1de070a468e6c