This reverts commit 7709a057. Reason for revert: Broke mac checkbuilds Change-Id: If71ec9198ca8943d90ce9d5e3a277faf239e38a5