You're right that this is unnecessary. We've fixed this in our code branch slated for a future release. Unfortunately, there's no great workaround right now. You could add gateways, deploy CC, then remove gateways, but that's far from ideal. ... View more