Move the callers that need to use the new cli_open() back to calling