This reverts commit 9bef5238. Reason for revert: Broke things Change-Id: Ic3deac4fb6992572ac0cc95fa04d003e0c29f113