diff --git a/ChangeLog b/ChangeLog
index 3e58a92d8..d0cd84a5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,10 @@
 2007-01-04  David Turner  <david@freetype.org>
 
-	* src/sfnt/ttmtx.c: don't extract the metrics table from the
-	SFNT font file. Instead, reparse it on each glyph load,
-	since the runtime difference will not be noticeable, and
-	it can save a lot of heap memory when memory-mapped files
-	are not used.
+	* src/sfnt/ttmtx.c, include/freetype/internal/tttypes.h:
+	don't extract the metrics table from the SFNT font file.
+	Instead, reparse it on each glyph load, since the runtime
+	difference will not be noticeable, and it can save a lot
+	of heap memory when memory-mapped files are not used.
 
 	* src/sfnt/ttcmap.c: slight optimization in the CMAP 4 validator
 
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 010f4103a..afd8139db 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -605,7 +605,7 @@ FT_BEGIN_HEADER
    * is recommended to disable the macro since it reduces the library's code
    * size and activates a few memory-saving optimizations as well.
    */
-/* #define FT_CONFIG_OPTION_OLD_INTERNALS */
+#define FT_CONFIG_OPTION_OLD_INTERNALS
 
 
   /*