Revert r40837, r40839, r40840 (bug 332 - broken UTF-8)