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