diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
index 6199c126d1..715662e669 100644
--- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
@@ -728,6 +728,20 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					}
 				}
 
+				// Optimal victim scan radii are now calculated automatically
+				if (engineVersion < 20170505)
+				{
+					var targetExtraSearchRadius = node.Value.Nodes.FirstOrDefault(n => n.Key == "TargetSearchRadius" || n.Key == "TargetExtraSearchRadius");
+					if (targetExtraSearchRadius != null)
+					{
+						Console.WriteLine("Warheads and projectiles now calculate the best victim search radius automatically.");
+						Console.WriteLine("If you absolutely need to override that for whatever reason, use the new fields:");
+						Console.WriteLine("VictimScanRadius for warheads, BlockerScanRadius for projectiles,");
+						Console.WriteLine("BounceBlockerScanRadius for bouncing Bullets and AreaVictimScanRadius for AreaBeams.");
+						node.Value.Nodes.Remove(targetExtraSearchRadius);
+					}
+				}
+
 				UpgradeWeaponRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}
 		}