From 3bbe8979d351e28219725267de5db520154b2e2e Mon Sep 17 00:00:00 2001
From: Vignesh Babu <vigneshbabu@google.com>
Date: Thu, 1 Feb 2024 11:08:42 -0800
Subject: [PATCH] Automated rollback of commit
 86976512162f804b71614cbd78c132fd5c972477.

PiperOrigin-RevId: 603424171
---
 src/core/BUILD                                |  2 --
 .../transport/chttp2/server/chttp2_server.cc  | 19 +------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/core/BUILD b/src/core/BUILD
index 0c457ac9d9f..127c4110910 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -6288,13 +6288,11 @@ grpc_cc_library(
         "closure",
         "error",
         "error_utils",
-        "event_engine_tcp_socket_utils",
         "grpc_insecure_credentials",
         "handshaker_registry",
         "iomgr_fwd",
         "memory_quota",
         "pollset_set",
-        "posix_event_engine_tcp_socket_utils",
         "resolved_address",
         "resource_quota",
         "status_helper",
diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc
index 5b92bc1ea3e..dea28445a4f 100644
--- a/src/core/ext/transport/chttp2/server/chttp2_server.cc
+++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc
@@ -56,8 +56,6 @@
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
-#include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
-#include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -97,8 +95,6 @@ namespace grpc_core {
 namespace {
 
 using ::grpc_event_engine::experimental::EventEngine;
-using ::grpc_event_engine::experimental::PosixSocketWrapper;
-using ::grpc_event_engine::experimental::ResolvedAddressToURI;
 
 const char kUnixUriPrefix[] = "unix:";
 const char kUnixAbstractUriPrefix[] = "unix-abstract:";
@@ -1080,25 +1076,12 @@ void grpc_server_add_channel_from_fd(grpc_server* server, int fd,
 
   grpc_core::ChannelArgs server_args = core_server->channel_args();
   std::string name = absl::StrCat("fd:", fd);
-  // The fd is going to be registered with the gRPC poller to be asynchronously
-  // notified for read/write/error events. It must be marked as NonBlocking
-  // to ensure that the poller/gRPC executor threads do not get blocked on
-  // the socket when attempting to read/write from it.
-  grpc_core::PosixSocketWrapper sock(fd);
-  (void)sock.SetSocketNonBlocking(true);
-  (void)sock.SetSocketCloexec(true);
-  (void)sock.SetSocketNoSigpipeIfPossible();
-  auto peer_address = sock.PeerAddress();
-  std::string addr_str = name;
-  if (peer_address.ok()) {
-    addr_str = *grpc_core::ResolvedAddressToURI(peer_address.value());
-  }
   auto memory_quota =
       server_args.GetObject<grpc_core::ResourceQuota>()->memory_quota();
   grpc_endpoint* server_endpoint = grpc_tcp_create_from_fd(
       grpc_fd_create(fd, name.c_str(), true),
       grpc_event_engine::experimental::ChannelArgsEndpointConfig(server_args),
-      addr_str);
+      name);
   grpc_core::Transport* transport = grpc_create_chttp2_transport(
       server_args, server_endpoint, false  // is_client
   );