font-fixes
Revert "font-fixes"

This reverts commit af7ff2258c733993234c8084d26da274c22c23a2.
Revert "Revert "font-fixes""

This reverts commit fab2197d90716cd011c6da279f1a385544e36f18.