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

This reverts commit 225bfb760a3dade91aa599a86ecc3e818fa96b20.

Reason for revert: We are possibly losing tombstones

Change-Id: I8372ae3b7b5db63bc48155eca63eb3cae41239c8
10 files changed