Revert "WIP mac"

This reverts commit 0fdb03cf79ad3493245ba7f37b6fda5775dbd836.
19 files changed