Restoring changes to NetworkClient that were accidently overwritten in a previous merge