One last Charade reference to remove here.
Merge pull request #1901 from mjpieters/chardet-not-charade

One last Charade reference to remove here.