Bug 10976 - incorrectly upgrades everything to UTF-8

Summary: incorrectly upgrades everything to UTF-8