Bug 966007 - Fix old connections for unsubscribe event

[merge]