This reverts commit a8df174369. Reason for revert: Caused QTBUG-122109 Pick-to: 6.5 6.6 6.7 Fixes: QTBUG-122109 Fixes: QTBUG-120699 Change-Id: Iea185c00f35e17d8eb8e8da70dc2d808ea274b04 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
a8df174369