hammerhead: Make proximity check opt-in

This function's behavior is annoying and can even be
a deal-breaker for new or undiscerning CM users.

Change-Id: I51e43fd2adeaab79e74541fafadac95e16b267ff