This commit repeats 34f241c051 . Looks like that didn't survive the merge. Task-number: QTBUG-12057
34f241c051