Remove unused code path - simplifies other refactoring.
Merge pull request #2713 from glennw/font-cleanup-2

Remove unused code path - simplifies other refactoring.