Revert "Some rather dubious character substitutions."

This reverts commit 792b71fbe9fe7fae5b901c14463bfee2d6dfd315.