Merge "Refactor rev_delete handling on deletion"