More font hackery. Will it ever end?

Fixes #1606