revert base_path for client_config and client_subscription