diff --git a/ChangeLog b/ChangeLog
index 42f93b03e..a04539548 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-02-07  Werner Lemberg  <wl@gnu.org>
+
+	[cff] Minor.
+
+	* src/cff/cffgload.c (cff_decoder_parse_charstrings) <cff_op_sqrt>:
+	Remove dead code.
+
 2016-02-07  Werner Lemberg  <wl@gnu.org>
 
 	[cff] Implement missing operators in new engine (except `random').
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 36a353d78..df57d67e5 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -2082,15 +2082,14 @@
 
           if ( args[0] > 0 )
           {
-            FT_Int    count = 9;
-            FT_Fixed  root  = args[0];
+            FT_Fixed  root = args[0];
             FT_Fixed  new_root;
 
 
             for (;;)
             {
               new_root = ( root + FT_DivFix( args[0], root ) + 1 ) >> 1;
-              if ( new_root == root || count <= 0 )
+              if ( new_root == root )
                 break;
               root = new_root;
             }