This reverts commit eb257295. Reason for revert: Broke build Change-Id: I694c84dec6ae47a6c86fa1036802cdd750490efc