Now it's killing the mac, going back to previous commit.
Revert aa5e71f..cf78ae0

This rolls back to commit aa5e71f65a575f5e721e737ddc4af56e56608748.