Remove typeface changes

fontforge's font merging didn't seem to perserve the existing glyphs.
Revert for now.