Revert "Bugfixes included"

This reverts commit 6191fdb7a601b03e6814d2b262e32df24eab84c4.