Small cleanup now that we have multiple details about the server stored on the cli Upstream-commit: 9cfbcd4471 Component: cli
9cfbcd4471