This reverts commit eb4640ba. Reason for revert: breaks mac builds. Change-Id: I4b80a997e0580bd3a20dfb427a6e83cf0c2b2d47