This reverts commit 4c0737eb80af8a1e0c0bab4c51454807837dfdde, reversing changes made to 943c4ed72ff85bb9a2610d8909ee68bb0f0d0744.
Port of the qt56 compatibility patch 7a9400d by @acowley