Refs #5962, fixing last commit (not applied to every place).