Revert due to missing cmake on OSX.

This reverts commit eb2ce8cc, reversing
changes made to 07b13282.

Change-Id: I8fcb1f4d1335f999e92750af6f12c388aa5fa6bb