Revert "Merge pull request #2 from jyap808/osx_build_fixes"

This reverts commit 5c70a86460b12e92be520ae8ee501101f68856cc, reversing
changes made to cf882ecd08d63682370e8e928a63ed51b9aa6734.