Try to make the QTBUG-6322 workaround work in more cases