Don't assume charset name has been normalized here.
Bump the DATA_VERSION. Fix the check for DATA_VERSION.