Revert "This was scary! :D"

This reverts commit 655607b595a50c9c510683ea404e470ad0895f35.