backport fix for ivs unplug