Qt4 - revert part of [23442]. Fix and close #1398.