Revert previous change to get rid of MULTIBYTE_SUPPORT ifdef. It turns out