Merge "Revert part of ag/6685504" into qt-dev