Revert "Bugfixes"

This reverts commit fbcf62fe0f6b36bcf5f636241250fce84ff52f6e.