Back out r42182 for now "Move UDP stuff to new UDP class"