[wip] NSX integration fixes

I'm confused because you added a `return` above, so this shouldn't be reached?