Revisions 1.96 & 1.97 of lisp/international/fonset.el break the  
NextStep port of Emacs. See #2218, #2221.

This patch reverts those changes.