diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh
index b9dddb2ac..cf08d7961 100644
--- a/src/hb-aat-layout-morx-table.hh
+++ b/src/hb-aat-layout-morx-table.hh
@@ -661,17 +661,13 @@ struct InsertionSubtable
 	 * current glyph, the next glyph processed would in fact be the first
 	 * one inserted."
 	 *
-	 * So, if DontAdvance *is* set, we move to "end", such that newly
-	 * inserted glyphs are visible.
+	 * This suggests that if DontAdvance is NOT set, we should move to
+	 * end+count.  If it *was*, then move to end, such that newly inserted
+	 * glyphs are now visible.
 	 *
-	 * If DontAdvance is *not* set, if inserted before, move past them,
-	 * such that original current glyph will be skipped over by the driver.
-	 * Otherwise, again, just move to "end" such that current glyph will
-	 * be skipped over by driver.
-	 *
-	 * https://github.com/harfbuzz/harfbuzz/issues/1224
+	 * https://github.com/harfbuzz/harfbuzz/issues/1224#issuecomment-427691417
 	 */
-	buffer->move_to ((flags & DontAdvance) || !before ? end : end + count);
+	buffer->move_to ((flags & DontAdvance) ? end : end + count);
       }
 
       if (flags & SetMark)
diff --git a/test/shaping/data/text-rendering-tests/DISABLED b/test/shaping/data/text-rendering-tests/DISABLED
index 8539c0ee1..4e8b1cf24 100644
--- a/test/shaping/data/text-rendering-tests/DISABLED
+++ b/test/shaping/data/text-rendering-tests/DISABLED
@@ -1,3 +1,6 @@
+# https://github.com/harfbuzz/harfbuzz/issues/1224
+tests/MORX-35.tests
+
 # Non-Unicode cmap
 tests/CMAP-3.tests
 
diff --git a/test/shaping/data/text-rendering-tests/Makefile.sources b/test/shaping/data/text-rendering-tests/Makefile.sources
index c7f487600..5a3d20a6c 100644
--- a/test/shaping/data/text-rendering-tests/Makefile.sources
+++ b/test/shaping/data/text-rendering-tests/Makefile.sources
@@ -55,7 +55,6 @@ TESTS = \
 	tests/MORX-32.tests \
 	tests/MORX-33.tests \
 	tests/MORX-34.tests \
-	tests/MORX-35.tests \
 	tests/MORX-36.tests \
 	tests/MORX-37.tests \
 	tests/MORX-38.tests \
@@ -74,6 +73,7 @@ TESTS = \
 
 DISBALED_TESTS = \
 	tests/CMAP-3.tests \
+	tests/MORX-35.tests \
 	tests/SHARAN-1.tests \
 	tests/SHBALI-1.tests \
 	tests/SHBALI-2.tests \