Revert "Refactor discoverd connection"

This reverts commit 347608d6b5d827647f0e5ca1269a4d8f00b7915d.

There is an intermittent issue that I don't have time to fix,
causing a panic from rpcplus that makes it look like the client is
nil (triggered at RegisterAndStandby).

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>