[Reviewer Andy] Fix user initiated de-registration

Andy

This is, I think, the right fix to your problem with the IMS Bench tests - it passes UTs and live tests, although obviously neither of those hits this exact case.  I'll add a UT for it next week.

Mike