Revert "Think I fixed the stuff"

This reverts commit 915f9d08b100fb30bbca689e205159264e61cb13.