This reverts commit c6142d97d79bc6a5ce2bb77fce9ae5d988f49542. Change-Id: Idc6fde822bf42300897d96fc934a94e6b9418d76