fixes #11227 (closed)
Please test @Raatty
This will create a new commit in order to revert the existing changes.
