Remove the dependency in the external interface for servers to have a client. The client is now added by the builder method, albeit in a very clumsy and strictly speaking incorrect manner.