Revert "Ok ok. More bugfixes. Bug bug buggaloo"

This reverts commit d0948b3a14a350d55a28fad490386b2c2c4521f8.