Switched to a slightly customized FoldToASCII char filter in Solr.