Revert "OSX Update"

This reverts commit bf867b9dc94c3c47f753b01b6466f1cbcd8893ac.
Revert "OSX Update"

This reverts commit 3ba571df611145c061544b2ca76af8f2630e7708.