[wip] NSX integration fixes

(this would be the second place for the `unless`, but see my previous comment)