This reverts commit f00bd7134e.
Fix has been merged to meta-openembedded
Fixes: QTBUG-118868
Change-Id: I2d5f03d49e48605dad2bbc0b0c6885fe3f73ef75
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 44f08284c7)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>