Revert "Bugfix"

This reverts commit 89f217973592983ac1d06ac6cda81e966835230b.