Bug 23355: (RM follow-up) Make DB update idempotent