Revert "Merge upstream again"
It made me unable to build and/or run Carbon on my Mac, so I reverted it for now. Will merge once I'm ready for a pull request

This reverts commit e55d2d8be3ba93c54d808c349c3596cae473f8ba, reversing
changes made to ab4df7a40dbcef428309df70dba67c0cd820b531.

Conflicts:
	src/main/java/com/lastabyss/carbon/Carbon.java