Build with --disable-unicode again. Fixes #1158607.
Will backport to 2.4.
diff --git a/Misc/NEWS b/Misc/NEWS
index e387e63..36a21ce 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -221,6 +221,8 @@
 Build
 -----
 
+- Bug #1158607: Build with --disable-unicode again.
+
 - spwdmodule.c is built only if either HAVE_GETSPNAM or HAVE_HAVE_GETSPENT is
   defined.  Discovered as a result of not being able to build on OS X.