Revert "Reverse everything!"

This reverts commit 6ab8bcf15a920dab7c51eb26e6664a79fdccb297.