Here it also keep track of the connection, as it needs to be explicitly
disconnected in one place.

Change-Id: Id3e2882106ae55c2d880898956a36f84d3ce70ef