Moving this default to CLIClientOptions would be preferable.