Merge pull request #6163 from JosJuice/simple-ini-ir Revert "Convert to/from old EFB scale numbering"