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