Revert "Bugfixes"

This reverts commit 5f21630d33ff8fb00772d348643920a141be32eb.