diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index b24ef66839..9db4b2dbbd 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -244,7 +244,6 @@
     <Compile Include="Player\ClassicProductionQueue.cs" />
     <Compile Include="Player\PlaceBuilding.cs" />
     <Compile Include="Player\ProductionQueue.cs" />
-    <Compile Include="Player\SurrenderOnDisconnect.cs" />
     <Compile Include="Player\TechTree.cs" />
     <Compile Include="PrimaryBuilding.cs" />
     <Compile Include="Production.cs" />
diff --git a/OpenRA.Mods.RA/Player/SurrenderOnDisconnect.cs b/OpenRA.Mods.RA/Player/SurrenderOnDisconnect.cs
deleted file mode 100644
index 2b2083689f..0000000000
--- a/OpenRA.Mods.RA/Player/SurrenderOnDisconnect.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using OpenRA.Network;
-using OpenRA.Traits;
-
-namespace OpenRA.Mods.RA
-{
-	class SurrenderOnDisconnectInfo : TraitInfo<SurrenderOnDisconnect> {}
-
-	class SurrenderOnDisconnect : ITick
-	{
-		bool Disconnected = false;
-
-		public void Tick(Actor self)
-		{
-			var p = self.Owner;
-			if (Disconnected || !p.PlayerReference.Playable) return;
-			if (p.WinState == WinState.Lost || p.WinState == WinState.Won) return; /* already won or lost */
-
-			var client = p.World.LobbyInfo.ClientWithIndex(p.ClientIndex);
-			if (client == null)
-				return;
-
-			if (client.State == Session.ClientState.Disconnected)
-			{
-				Disconnected = true; /* dont call this multiple times! */
-				self.World.Players.Do(pl => pl.PlayerActor.TraitsImplementing<IResolveOrder>().Do(t => t.ResolveOrder(pl.PlayerActor, new Order("Surrender", self, false))));
-			}
-		}
-	}
-}
diff --git a/mods/cnc/rules/system.yaml b/mods/cnc/rules/system.yaml
index d67c5a6703..542b08d410 100644
--- a/mods/cnc/rules/system.yaml
+++ b/mods/cnc/rules/system.yaml
@@ -44,7 +44,6 @@ Player:
 	PlayerColorPalette:
 		BasePalette: terrain
 		PaletteFormat: cnc
-	SurrenderOnDisconnect:
 	BaseAttackNotifier:
 
 World:
diff --git a/mods/ra/rules/system.yaml b/mods/ra/rules/system.yaml
index e2af9b95bd..54362ab8e9 100644
--- a/mods/ra/rules/system.yaml
+++ b/mods/ra/rules/system.yaml
@@ -130,7 +130,6 @@ Player:
 		SquadSize: 10
 	PlayerColorPalette:
 		BasePalette: terrain
-	SurrenderOnDisconnect:
 	DebugResourceCash:
 	DebugResourceOre:
 	DebugResourceOreCapacity: