Revert "Attempting more fonts fixes"

This reverts commit cdf9261443b01f29a1b0ef0deb53e8e8ee9b5b35.
* That did not work.