Merge "Revert "Change the way tombstones are added to dropbox."" into main