This reverts commit 2ddc3731. Temporarily revert the commit to debug test regressions in kwin.
mentioned in commit a2eeddc6