This reverts commit a7c9046973260aa71837410ffc8df8c296a2826f. Change-Id: I66d3d961988ff8dd330c9482c070bfca055f6cb8