Backport undo fix