Revert "This...Will...Hurt"

This reverts commit 4ad6a6df2421773a2ebe72f2e35220f674666708.
Let's try this now