Revert "And now with everything working."

This reverts commit 4c672fdfcd6d6fd09ec08645d3e8fea4ae1c6001.