NXIO-158: Ensure that passivator is correctly removed