This reverts commit 7a9e0494. The commit in question breaks the patches to qtbase, causing the build to fail. An issue to track this feature will follow.