Bug 942744 - Stop discovering before connecting