Undo now works with auto archiving