attempt at fixing the revert-to-more-glyphs bug

Cherry-picked from FontAnvil.  This should fix #486 - which is a blocking issue for issues like #637 and #1030.  Some testing that I can't easily do myself may be appropriate before merge.