This reverts commit aa0cfa7b6bf8000c59ceca2f9b698103e553d402. Change-Id: Ia58b6ac4778c1c376db144f6c5bde22adbc41c10