This reverts commit e5bfa7ff24. Reason for revert: broke build Change-Id: I61cec3bb6c392bbaf73f0dc31d73df79683d77a0
e5bfa7ff24