[wip] NSX integration fixes

Also, please add a comment to explain why we don't need anything after this `return` :-)