Restore UNIVCHARDET integration