diff --git a/src/hb-subset-cff-common.hh b/src/hb-subset-cff-common.hh
index acd980968..d53dccfe1 100644
--- a/src/hb-subset-cff-common.hh
+++ b/src/hb-subset-cff-common.hh
@@ -349,8 +349,14 @@ struct parsed_cs_str_t : parsed_values_t<parsed_cs_op_t>
 
       unsigned int parsed_len = get_count ();
       if (likely (parsed_len > 0))
+      {
 	values[parsed_len-1].set_skip ();
 
+	/* Note(behdad): Alternatively, we can pop the subr number completely instead?
+	 * Seems to work. */
+        //values.pop ();
+      }
+
       parsed_cs_op_t val;
       val.init (subr_num);
       SUPER::add_op (op, str_ref, val);