backed out change for ticket #649 (it was causing other font issues)