Bug 18928: (follow-up) Make DB update idempotent