Revert "Bugfix"

This reverts commit 0ae21a7f928bc3a23bc589ca74fc39efeda8d545.