diff --git a/src/hb-subset-input.cc b/src/hb-subset-input.cc
index 1c7b1eb5e..b6c09d9d9 100644
--- a/src/hb-subset-input.cc
+++ b/src/hb-subset-input.cc
@@ -404,10 +404,14 @@ hb_subset_input_keep_everything (hb_subset_input_t *input)
     hb_set_invert (set);
   }
 
+  // Don't drop any tables
+  hb_set_clear (hb_subset_input_set (input, HB_SUBSET_SETS_DROP_TABLE_TAG));
+
   hb_subset_input_set_flags (input,
 			     HB_SUBSET_FLAGS_NOTDEF_OUTLINE |
 			     HB_SUBSET_FLAGS_GLYPH_NAMES |
-			     HB_SUBSET_FLAGS_NO_PRUNE_UNICODE_RANGES);
+			     HB_SUBSET_FLAGS_NO_PRUNE_UNICODE_RANGES |
+                             HB_SUBSET_FLAGS_PASSTHROUGH_UNRECOGNIZED);
 }
 
 #ifndef HB_NO_VAR