Reworked rejoin_channels_mode patch