diff --git a/ChangeLog b/ChangeLog
index 26f05782a..6f5863f83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
   * src/psnames/psmodule.c: rewrote some parts to comply with recent
     changes in 'pstables.h'
 
+  * src/base/ftobjs.c (FT_Set_Char_Sizes): fix for bug #12263
+
 2005-03-06  David Turner  <david@freetype.org>
 
 	* src/otvalid/otvgsub.c, src/otvalid/otvgpos.c: Make static tables
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index c959afacb..960893fe1 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -2011,9 +2011,11 @@
       FT_UShort  x_ppem = (FT_UShort)( ( dim_x + 32 ) >> 6 );
       FT_UShort  y_ppem = (FT_UShort)( ( dim_y + 32 ) >> 6 );
 
+    /* this code is disabled, for an explanation, see bug#12263 */
+#if 0
       if ( x_ppem == metrics->x_ppem && y_ppem == metrics->y_ppem )
         return FT_Err_Ok;
-
+#endif
       metrics->x_ppem = x_ppem;
       metrics->y_ppem = y_ppem;
     }