Revert "Bugfixes"

This reverts commit 541803610583663f8b1b4387f82f6859f2507ab8.