Revert r565281. It breaks UTF-8.
Reported by: Trond.Endrestol at ximalas.info
Christos Chatzaras <chris at cretaforce.gr>
PR: 253515