Reverting to original UDP-only version. (c7ded30..0d375fb)

This rolls back to commit c7ded3021bfe159216ff80a8d554a544103ea7c1.