- fixes the regression that went in short as "last minute fix": commit c5daa88b82 -> fixes #7242 - also remove a doubled entry in an IF
- fixes the regression that went in short as "last minute fix": commit c5daa88b82 -> fixes #7242 - also remove a doubled entry in an IF