Revert "Hope this isn't going to break anything"

This reverts commit 993c29703f4ee9efa5f331a6b1a464f3f284b2e7.