[wip] NSX integration fixes

Why do we do this here, and not in the function earlier (the one you're already changing)?