diff --git a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/HttpChannelFactory.cs b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/HttpChannelFactory.cs
index b295ed5f169..89ca1bcf41f 100644
--- a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/HttpChannelFactory.cs
+++ b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/HttpChannelFactory.cs
@@ -1175,12 +1175,6 @@ private bool PrepareMessageHeaders(Message message)
                         action = string.Format(CultureInfo.InvariantCulture, "\"{0}\"", UrlUtility.UrlPathEncode(action));
                     }
 
-                    if (message.Version.Addressing == AddressingVersion.None)
-                    {
-                        message.Headers.Action = null;
-                        message.Headers.To = null;
-                    }
-
                     bool suppressEntityBody = message is NullMessage;
 
                     object property;
diff --git a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/MessageContent.cs b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/MessageContent.cs
index c924cb225c4..d1af785d431 100644
--- a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/MessageContent.cs
+++ b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/MessageContent.cs
@@ -51,6 +51,12 @@ private void PrepareContentHeaders()
                 action = string.Format(CultureInfo.InvariantCulture, "\"{0}\"", UrlUtility.UrlPathEncode(action));
             }
 
+            if (_message.Version.Addressing == AddressingVersion.None)
+            {
+                _message.Headers.Action = null;
+                _message.Headers.To = null;
+            }
+
             object property;
             if (_message.Properties.TryGetValue(HttpRequestMessageProperty.Name, out property))
             {
diff --git a/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs b/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs
index 53d55848c92..fb7af171868 100644
--- a/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs
+++ b/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs
@@ -633,11 +633,6 @@ public static string Tcp_Session_Tests_Duplex_Service
         }
     }
 
-    public static string TcpSoap12WSANone_Address
-    {
-        get { return GetEndpointAddress("TcpSoap12WSANone.svc/tcp-Soap12WSANone", protocol: "net.tcp"); }
-    }
-
     public static string TcpSoap11WSA10_Address
     {
         get { return GetEndpointAddress("TcpSoap11WSA10.svc/tcp-Soap11WSA10", protocol: "net.tcp"); }
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/MessageVersionTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/MessageVersionTests.cs
index 22993c6caaa..e9849c425fe 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/MessageVersionTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/MessageVersionTests.cs
@@ -87,7 +87,6 @@ public static void SameBinding_Soap11WSA2004_EchoString()
 
     [WcfFact]
     [OuterLoop]
-    [Issue(2864)]
     public static void SameBinding_Soap12_EchoString_Http()
     {
         CustomBinding binding = null;
@@ -122,43 +121,6 @@ public static void SameBinding_Soap12_EchoString_Http()
         }
     }
 
-    [WcfFact]
-    [OuterLoop]
-    [Issue(2864)]
-    public static void SameBinding_Soap12_EchoString_Tcp()
-    {
-        CustomBinding binding = null;
-        EndpointAddress endpointAddress = null;
-        ChannelFactory<IWcfService> factory = null;
-        IWcfService serviceProxy = null;
-        string result = null;
-        string testString = "Hello";
-
-        try
-        {
-            // *** SETUP *** \\
-            binding = new CustomBinding(new TextMessageEncodingBindingElement(MessageVersion.CreateVersion(EnvelopeVersion.Soap12, AddressingVersion.None), Encoding.UTF8), new TcpTransportBindingElement());
-            endpointAddress = new EndpointAddress(Endpoints.TcpSoap12WSANone_Address);
-            factory = new ChannelFactory<IWcfService>(binding, endpointAddress);
-            serviceProxy = factory.CreateChannel();
-
-            // *** EXECUTE *** \\
-            result = serviceProxy.Echo(testString);
-
-            // *** VALIDATE *** \\
-            Assert.True(String.Equals(result, testString), String.Format("    Error: expected response from service: '{0}' Actual was: '{1}'", testString, result));
-
-            // *** CLEANUP *** \\
-            factory.Close();
-            ((ICommunicationObject)serviceProxy).Close();
-        }
-        finally
-        {
-            // *** ENSURE CLEANUP *** \\
-            ScenarioTestHelpers.CloseCommunicationObjects((ICommunicationObject)serviceProxy, factory);
-        }
-    }
-
     [WcfFact]
     [OuterLoop]
     public static void SameBinding_Soap11WSA10_EchoString_Http()
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpSoap12WSANoneTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpSoap12WSANoneTestServiceHost.cs
deleted file mode 100644
index 4d711a1b136..00000000000
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpSoap12WSANoneTestServiceHost.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.ServiceModel;
-using System.ServiceModel.Activation;
-using System.ServiceModel.Channels;
-using System.Text;
-
-namespace WcfService
-{
-    public class TcpSoap12WSANoneTestServiceHostFactory : ServiceHostFactory
-    {
-        protected override ServiceHost CreateServiceHost(Type serviceType, Uri[] baseAddresses)
-        {
-            TcpSoap12WSANoneTestServiceHost serviceHost = new TcpSoap12WSANoneTestServiceHost(serviceType, baseAddresses);
-            return serviceHost;
-        }
-    }
-    public class TcpSoap12WSANoneTestServiceHost : TestServiceHostBase<IWcfService>
-    {
-        protected override string Address { get { return "tcp-Soap12WSANone"; } }
-
-        protected override Binding GetBinding()
-        {
-            return new CustomBinding(new TextMessageEncodingBindingElement(MessageVersion.Soap12, Encoding.UTF8), new TcpTransportBindingElement() { PortSharingEnabled = false });
-        }
-
-        public TcpSoap12WSANoneTestServiceHost(Type serviceType, params Uri[] baseAddresses)
-            : base(serviceType, baseAddresses)
-        {
-        }
-    }
-}
diff --git a/src/System.Private.ServiceModel/tools/SelfHostedWcfService/Program.cs b/src/System.Private.ServiceModel/tools/SelfHostedWcfService/Program.cs
index 3150f2c7c3a..3ae5900b323 100644
--- a/src/System.Private.ServiceModel/tools/SelfHostedWcfService/Program.cs
+++ b/src/System.Private.ServiceModel/tools/SelfHostedWcfService/Program.cs
@@ -100,7 +100,6 @@ private static void Main()
             CreateHost<TcpSessionTestServiceHost, WcfService.SessionTestsDefaultService>("SessionTestsDefaultService.svc", tcpBaseAddress);
             CreateHost<TcpSessionShortTimeoutTestServiceHost, WcfService.SessionTestsShortTimeoutService>("SessionTestsShortTimeoutService.svc", tcpBaseAddress);
             CreateHost<TcpSessionDuplexTestServiceHost, WcfService.SessionTestsDuplexService>("SessionTestsDuplexService.svc", tcpBaseAddress);
-            CreateHost<TcpSoap12WSANoneTestServiceHost, WcfService.WcfService>("TcpSoap12WSANone.svc", tcpBaseAddress);
             CreateHost<TcpSoap11WSA10TestServiceHost, WcfService.WcfService>("TcpSoap11WSA10.svc", tcpBaseAddress);
             CreateHost<DuplexWebSocketTestServiceHost, WcfWebSocketService>("DuplexWebSocket.svc", websocketBaseAddress);
             CreateHost<WebSocketTransportTestServiceHost, WcfWebSocketTransportUsageAlwaysService>("WebSocketTransport.svc", websocketBaseAddress);