Bugzilla #48512: Reverted rev 908543. For some Type 1 fonts, the encoding mapped characters in the AFM file don't match the font's primary encoding. This change tries to address this fact.