This reverts commit 47a3aa697049bf53e8dd4cb76cf9ca262762a175. Change-Id: I457594c3f423f276b9c49dbbaf068284a36ba9f1