Working round-trip of undo with archive and trash