Remove hack for pinned charsets