I believe you removed this to fix your second bullet point. Is that right?

I don't think we can just drop this one. It's there to allow clients that are disconnected to automatically re-connect to the channel they were in.