This reverts commit c7fe777d63. Change-Id: I9992d404394917537d5c22470efbd970605976ed
c7fe777d63
0b5d57ab
715f8610