diff --git a/ChangeLog b/ChangeLog
index e1e3462a6..5cda52d32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-10  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Remove redundant code.
+
+	* src/autofit/aflatin.c (af_latin_metrics_init_widths): Do it.
+
 2015-12-09  Werner Lemberg  <wl@gnu.org>
 
 	[autofit] Thinko.
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index b85d6cd3d..3358c9900 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -143,9 +143,6 @@
 
       af_shaper_buf_destroy( face, shaper_buf );
 
-      if ( !glyph_index )
-        goto Exit;
-
       if ( !glyph_index )
         goto Exit;