Followup to r1742791: Probably the better fix is not fiddling with connection changes but instead use a NULL request like in similar places.