Replace fugly würgaround for QTBUG-6322 with a longer and even more fugly one