Revert "Bugfixes"

This reverts commit 76a509fc22d7641e98ce65daf7385e50521065d5.