Revert "merged upstream"

This reverts commit 686f07b8dbc745dae83a8d511409c6035e9f4013, reversing
changes made to fbe44a25e59bb0f8ddf6ac741beb917cf31b30f9.

Conflicts:
	project.clj