This reverts commit e2874cd9. Reason for revert: broke mac builds Bug: 113936524 Change-Id: Id0311d6b202b18e80953da632133548d56ed851a