This reverts commit 73e63e662c. Reason for revert: fix build breakage Change-Id: I37d33bd2536f1917ced8a1ba816f336e7c9bb4e8
73e63e662c