Fix duplicate service contacts.

Fixes #6058