Revert "More stupid bugs being fixed"

This reverts commit 4f77844281667b630d582a30703824ca525c5285.