I know it was this way before your PR, but it does seem odd to me that we create a distributor here if one didn't already exist. I guess we don't have another way in the CLI to do this.