This is essentially a revert of commit f5ec65ad8ebe which was apparently written with the author's help.
I suspect the issue is that we don't have different entries for "MS Shell Dlg" and "MS Shell Dlg 2". In non-CJK locales these should be "Microsoft Sans Serif" and "Tahoma" respectively. Most of our dialog templates should first be updated to use "MS Shell Dlg 2".