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

This reverts commit bdced39421aca350ce99da89811ba93cfe4c9d36, reversing
changes made to 7812a417826597f7098e81c3f6253d8d64ffbc5c.

This should get the 4 contacts tests passing on v1-train again.