Undo persistence take two