This reverts commit 5eac974c. Reason for revert: Broke build Change-Id: I82e58c215fa7c6f3162fe76a82002e251a7fe68c