This reverts commit 5a2d24e3. Reason for revert: breaks mac build Change-Id: I6429aaddea2c2cc1e71c5ab66d656392a112bd8f