This reverts commit 812519f22021ec529040d8c03998ccda241d8d0c. Change-Id: I3c56db1fb8e214da4659a77ed3a76f1020927d36