diff --git a/test/core/end2end/dualstack_socket_test.c.orig b/test/core/end2end/dualstack_socket_test.c.orig
deleted file mode 100644
index b443caa2a67249702d9c42b7c111f0333969716b..0000000000000000000000000000000000000000
--- a/test/core/end2end/dualstack_socket_test.c.orig
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include "src/core/iomgr/socket_utils_posix.h"
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/host_port.h>
-#include <grpc/support/log.h>
-#include "test/core/end2end/cq_verifier.h"
-#include "test/core/util/port.h"
-#include "test/core/util/test_config.h"
-
-/* This test exercises IPv4, IPv6, and dualstack sockets in various ways. */
-
-static void *tag(gpr_intptr i) { return (void *)i; }
-
-static gpr_timespec ms_from_now(int ms) {
- return gpr_time_add(gpr_now(), gpr_time_from_micros(GPR_US_PER_MS * ms));
-}
-
-static void drain_cq(grpc_completion_queue *cq) {
- grpc_event *ev;
- grpc_completion_type type;
- do {
- ev = grpc_completion_queue_next(cq, ms_from_now(5000));
- GPR_ASSERT(ev);
- type = ev->type;
- grpc_event_finish(ev);
- gpr_log(GPR_INFO, "Drained event type %d", type);
- } while (type != GRPC_QUEUE_SHUTDOWN);
-}
-
-void test_connect(const char *server_host, const char *client_host, int port,
- int expect_ok) {
- char *client_hostport;
- char *server_hostport;
- grpc_channel *client;
- grpc_server *server;
- grpc_completion_queue *client_cq;
- grpc_completion_queue *server_cq;
- grpc_call *c;
- grpc_call *s;
- cq_verifier *v_client;
- cq_verifier *v_server;
- gpr_timespec deadline;
-
- gpr_join_host_port(&client_hostport, client_host, port);
- gpr_join_host_port(&server_hostport, server_host, port);
- gpr_log(GPR_INFO, "Testing with server=%s client=%s (expecting %s)",
- server_hostport, client_hostport, expect_ok ? "success" : "failure");
-
- /* Create server. */
- server_cq = grpc_completion_queue_create();
- server = grpc_server_create(server_cq, NULL);
- GPR_ASSERT(grpc_server_add_http2_port(server, server_hostport));
- grpc_server_start(server);
- gpr_free(server_hostport);
- v_server = cq_verifier_create(server_cq);
-
- /* Create client. */
- client_cq = grpc_completion_queue_create();
- client = grpc_channel_create(client_hostport, NULL);
- gpr_free(client_hostport);
- v_client = cq_verifier_create(client_cq);
-
- if (expect_ok) {
- /* Normal deadline, shouldn't be reached. */
- deadline = ms_from_now(60000);
- } else {
- /* Give up faster when failure is expected.
- BUG: Setting this to 1000 reveals a memory leak (b/18608927). */
- deadline = ms_from_now(1500);
- }
-
- /* Send a trivial request. */
- c = grpc_channel_create_call(client, "/foo", "test.google.com", deadline);
- GPR_ASSERT(c);
-
- GPR_ASSERT(GRPC_CALL_OK ==
- grpc_call_start_invoke(c, client_cq, tag(1), tag(2), tag(3), 0));
- if (expect_ok) {
- /* Check for a successful request. */
- cq_expect_invoke_accepted(v_client, tag(1), GRPC_OP_OK);
- cq_verify(v_client);
-
- GPR_ASSERT(GRPC_CALL_OK == grpc_call_writes_done(c, tag(4)));
- cq_expect_finish_accepted(v_client, tag(4), GRPC_OP_OK);
- cq_verify(v_client);
-
- GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call(server, tag(100)));
- cq_expect_server_rpc_new(v_server, &s, tag(100), "/foo", "test.google.com",
- deadline, NULL);
- cq_verify(v_server);
-
- GPR_ASSERT(GRPC_CALL_OK == grpc_call_accept(s, server_cq, tag(102), 0));
- cq_expect_client_metadata_read(v_client, tag(2), NULL);
- cq_verify(v_client);
-
- GPR_ASSERT(GRPC_CALL_OK ==
- grpc_call_start_write_status(s, GRPC_STATUS_UNIMPLEMENTED, "xyz",
- tag(5)));
- cq_expect_finished_with_status(v_client, tag(3), GRPC_STATUS_UNIMPLEMENTED,
- "xyz", NULL);
- cq_verify(v_client);
-
- cq_expect_finish_accepted(v_server, tag(5), GRPC_OP_OK);
- cq_verify(v_server);
- cq_expect_finished(v_server, tag(102), NULL);
- cq_verify(v_server);
-
- grpc_call_destroy(c);
- grpc_call_destroy(s);
- } else {
- /* Check for a failed connection. */
- cq_expect_invoke_accepted(v_client, tag(1), GRPC_OP_ERROR);
- cq_expect_client_metadata_read(v_client, tag(2), NULL);
- cq_expect_finished_with_status(v_client, tag(3), GRPC_STATUS_CANCELLED,
- NULL, NULL);
- cq_verify(v_client);
-
- grpc_call_destroy(c);
- }
-
- cq_verifier_destroy(v_client);
- cq_verifier_destroy(v_server);
-
- /* Destroy client. */
- grpc_channel_destroy(client);
- grpc_completion_queue_shutdown(client_cq);
- drain_cq(client_cq);
- grpc_completion_queue_destroy(client_cq);
-
- /* Destroy server. */
- grpc_server_shutdown(server);
- grpc_server_destroy(server);
- grpc_completion_queue_shutdown(server_cq);
- drain_cq(server_cq);
- grpc_completion_queue_destroy(server_cq);
-}
-
-int main(int argc, char **argv) {
- int do_ipv6 = 1;
- int i;
- int port = grpc_pick_unused_port_or_die();
-
- grpc_test_init(argc, argv);
- grpc_init();
-
- if (!grpc_ipv6_loopback_available()) {
- gpr_log(GPR_INFO, "Can't bind to ::1. Skipping IPv6 tests.");
- do_ipv6 = 0;
- }
-
- for (i = 0; i <= 1; i++) {
- /* For coverage, test with and without dualstack sockets. */
- grpc_forbid_dualstack_sockets_for_testing = i;
-
- /* :: and 0.0.0.0 are handled identically. */
- test_connect("::", "127.0.0.1", port, 1);
- test_connect("::", "::ffff:127.0.0.1", port, 1);
- test_connect("::", "localhost", port, 1);
- test_connect("0.0.0.0", "127.0.0.1", port, 1);
- test_connect("0.0.0.0", "::ffff:127.0.0.1", port, 1);
- test_connect("0.0.0.0", "localhost", port, 1);
- if (do_ipv6) {
- test_connect("::", "::1", port, 1);
- test_connect("0.0.0.0", "::1", port, 1);
- }
-
- /* These only work when the families agree. */
- test_connect("127.0.0.1", "127.0.0.1", port, 1);
- if (do_ipv6) {
- test_connect("::1", "::1", port, 1);
- test_connect("::1", "127.0.0.1", port, 0);
- test_connect("127.0.0.1", "::1", port, 0);
- }
-
- }
-
- grpc_shutdown();
-
- return 0;
-}