Revert some temporary changes for Stage 1 refactor of Qt.