Revert "Ch-ch-ch-changes!"

This reverts commit 5f9e309330c74a2d6ed799aacc76c2c91ab327fe.