[wip] NSX integration fixes

This is breaking PFS. It's better to keep the old code, and add the new `unless` in the places I'll comment in 2s.