Revert "Fixing this fucking shit"

This reverts commit 622b6b84ecd2313c3b9dfd2b59560e106ddd1224.