Revert "Mac build fix"

This reverts commit 1c01c739718e65746f393b405a2bf97ce4cf8523.

Reason for revert: Mac build broken (required for merge conflicts).

Change-Id: Ibc4d6e69095ddd320e9e9814daa1a3a0cb11609f
1 file changed