This reverts commit f0004d1c. Reason for revert: <break mac builds> Change-Id: I7de0cddeb66096b57c89956c932cd7aaf6f6c5ab