Revert "fix the mac build"

This reverts commit 96d3e1ab37a0514f8ee9f838ae16beef291bdfe6.

Change-Id: I4fd0d35c91643169555c5d8739409dcdb44cbc14