This reverts commit f562aadd. Reason for revert: Reverting CVE-2021-39624 on qt-dev Change-Id: Ida84f497eb188b4923acbe8acdbe4d47427aa24e