diff --git a/src/hb-ot-cff-common.hh b/src/hb-ot-cff-common.hh
index 2f824cce6..299caf683 100644
--- a/src/hb-ot-cff-common.hh
+++ b/src/hb-ot-cff-common.hh
@@ -199,9 +199,7 @@ struct CFFIndex
     if (!it)
     {
       if (data_size) *data_size = 0;
-      // The following should return min_size IMO. But that crashes a few
-      // tests. I have not investigated why.
-      return 0; //min_size;
+      return min_size;
     }
 
     unsigned total = 0;