This reverts commit 434fe602. Reason for revert: Broke build Change-Id: I15d6fbf06902987e0517f4c72cbf440b7b570a60