Roll back some changes to fix a codepage issue.