Following #7498. We'll need to keep UDP for upgrade tests though.
Following #7498.
We'll need to keep UDP for upgrade tests though.