Revert "Revert "Revert "Revert "I think I'm done.""""

This reverts commit 7cff814a16baa1cd3d45a5bfe184d147bc91dc49.