This was already there, but we likely want to change it so we don't hold the lock while unsubscribing.