Merge "Avoid recreating ar_revid index after it's replaced by ar_revid_uniq"