is an "improved" fix to the symptom the previous commit tried to fix. :)
Japanese AFM fonts. PR: 4604 Submitted by: kiri@kiri.toba-cmt.ac.jp