Fix regression on plugin delete

Merge:	releng/9.1.0