Better handle already-used rev_id when restoring