The logic was already there but this rule was only applied in some
places, apply it in the remaining code paths.

Closes #7058