Revert "Hopefully fixing a few things"

This reverts commit 2345516d0b67b216fcb0f3873d258205fc2cfd3b.