Rework connectivity handling.