diff --git a/ChangeLog b/ChangeLog
index 89d66a63b..6ba919af9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-30  David Turner  <david@freetype.org>
+
+	* src/autofit/aftypes.h, src/autofit/afloader.c: disabling the
+	warper (i.e. light hinting improvements) to make a 2.3.1 bugfix
+	release before introducing a new feature. This should give us
+	more time to tune and improve the warper for the next release
+
 2007-01-25  David Turner  <david@freetype.org>
 
 	For light auto-hinting, improve glyph advance widths and resurrect
diff --git a/src/autofit/afloader.c b/src/autofit/afloader.c
index 382956f99..5dd9b046f 100644
--- a/src/autofit/afloader.c
+++ b/src/autofit/afloader.c
@@ -233,7 +233,7 @@
         FT_Pos   pp2x = loader->pp2.x;
 
         loader->pp1.x = FT_PIX_ROUND( pp1x + hints->xmin_delta );
-        loader->pp2.x = FT_PIX_ROUND( pp2x + hints->xmax_delta + 16 );
+        loader->pp2.x = FT_PIX_ROUND( pp2x + hints->xmax_delta );
 
         slot->lsb_delta = loader->pp1.x - pp1x;
         slot->rsb_delta = loader->pp2.x - pp2x;
diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h
index d3985cdd2..a78585d1a 100644
--- a/src/autofit/aftypes.h
+++ b/src/autofit/aftypes.h
@@ -53,7 +53,7 @@ FT_BEGIN_HEADER
   /*************************************************************************/
   /*************************************************************************/
 
-#define AF_USE_WARPER  /* only define to use warp hinting */
+#define xxAF_USE_WARPER  /* only define to use warp hinting */
 #define xxAF_DEBUG
 
 #ifdef AF_DEBUG