This reverts commit 95ada5ab89. Change-Id: Ifc436bbf1b05912a33d6805322659ee994dd6477
95ada5ab89
0f76f78f