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