This reverts commit 7999836e. Reason for revert: broke build Change-Id: Id02636908aed26ee0ed38042da1ace0125a6d417