diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh
index 50805eb82..cc15fddb3 100644
--- a/src/hb-aat-layout-morx-table.hh
+++ b/src/hb-aat-layout-morx-table.hh
@@ -155,7 +155,7 @@ struct RearrangementSubtable
 	}
       }
 
-      if (false/* TODO */ && flags & DontAdvance)
+      if (flags & DontAdvance)
         i--; /* TODO Detect infinite loop. */
 
       state = entry->newState;
@@ -259,7 +259,7 @@ struct ContextualSubtable
 	}
       }
 
-      if (false/* TODO */ && flags & DontAdvance)
+      if (flags & DontAdvance)
         i--; /* TODO Detect infinite loop. */
 
       state = entry->newState;