Broken build in Mac. This reverts commit 54d441cd. Change-Id: Ide67e312b988ccf6298d18593e5b9c78f950fdd8