Revert r187935 "Support for double width characters."

It broke a public build bot.