Revert "Rename make_unannounce_data helper to make_undo_data"