Revert "Merge pull request #390 from davehunt/fix-contact-locator"

This reverts commit bdced39421aca350ce99da89811ba93cfe4c9d36, reversing
changes made to 7812a417826597f7098e81c3f6253d8d64ffbc5c.
Merge pull request #402 from bobsilverberg/revert_locator_change

Revert "Merge pull request #390 from davehunt/fix-contact-locator"