Also revert my old hack to fix rendering of bug-poppler20605.pdf since
that was breaking the PS export.

What my old hack did was force the font type to be one of those that
read the CIDToGIDMap, what the new fix does is actually just read the
CIDToGIDMap for all fonts