Revert 0a5b30c..e2a4e12

This rolls back to commit 0a5b30c4bcdc095cd7244719e0060c725da3f04a.
Updated project from ClojureFX branch