Reverted some charset changes...