Dirtyable + Undo fixup