Build with --disable-unicode again. Fixes #1158607.
Will backport to 2.4.
7 files changed