Revert "Bugfix"

This reverts commit 4a3a64b20ca037e23f9357b1831c0f4e2894cf0f.
Revert "Revert "Bugfix""

This reverts commit 1daf97ff31508e3e1f1b35d50f33e3d6904680a0.
Revert "Revert "Revert "Bugfix"""

This reverts commit d61c4944785aca31f814744d340009359723b7c1.