Merge "Remove temporary upgrade logic." into qt-dev