diff --git a/src/hb-aat-layout-common.hh b/src/hb-aat-layout-common.hh
index 640778e45..90df68d9f 100644
--- a/src/hb-aat-layout-common.hh
+++ b/src/hb-aat-layout-common.hh
@@ -194,7 +194,10 @@ struct hb_aat_apply_context_t :
   HB_NODISCARD bool replace_glyph (hb_codepoint_t glyph)
   {
     if (glyph == DELETED_GLYPH)
-      return delete_glyph ();
+    {
+      buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_AAT_HAS_DELETED;
+      _hb_glyph_info_set_aat_deleted (&buffer->cur());
+    }
 
     if (likely (using_buffer_glyph_set))
       buffer_glyph_set->add (glyph);