diff --git a/hgext3rd/fbamend/fold.py b/hgext3rd/fbamend/fold.py
--- a/hgext3rd/fbamend/fold.py
+++ b/hgext3rd/fbamend/fold.py
@@ -16,7 +16,6 @@
     error,
     hg,
     lock as lockmod,
-    obsolete,
     phases,
     registrar,
     scmutil,
@@ -137,8 +136,8 @@
                                                    commitopts=commitopts)
             phases.retractboundary(repo, tr, targetphase, [newid])
 
-            obsolete.createmarkers(repo, [(ctx, (repo[newid],))
-                                   for ctx in allctx], operation='fold')
+            replacements = {ctx.node(): (newid,) for ctx in allctx}
+            scmutil.cleanupnodes(repo, replacements, 'fold')
 
             ui.status(_('%i changesets folded\n') % len(revs))
             if repo['.'].rev() in revs: