Rework raid re-connecting