Sure, I can enable raster fonts instead of dropping all code related to it.
How is the last patch changing weights of the criteria? The code was already preferring fixed fonts over charset.
Giving weight to charset (as oppossed to completely ignoring it if there's no fixed width font) is already fixing the issue. While it might make sense to improve weight calculation there's probably little benefit doing so (most systems will have a font that matches all criteria anyway).