diff --git a/OpenRA.Game/Map/MapCache.cs b/OpenRA.Game/Map/MapCache.cs
index 91b2304b30..d8f07e3f77 100644
--- a/OpenRA.Game/Map/MapCache.cs
+++ b/OpenRA.Game/Map/MapCache.cs
@@ -243,11 +243,31 @@ namespace OpenRA
 				});
 		}
 
+		bool IsSuitableInitialMap(MapPreview map)
+		{
+			if (map.Status != MapStatus.Available || !map.Visibility.HasFlag(MapVisibility.Lobby))
+				return false;
+
+			// Other map types may have confusing settings or gameplay
+			if (!map.Categories.Contains("Conquest"))
+				return false;
+
+			// Maps with bots disabled confuse new players
+			if (map.Players.Players.Any(x => !x.Value.AllowBots))
+				return false;
+
+			// Large maps expose unfortunate performance problems
+			if (map.Bounds.Width > 128 || map.Bounds.Height > 128)
+				return false;
+
+			return true;
+		}
+
 		public string ChooseInitialMap(string initialUid, MersenneTwister random)
 		{
 			if (string.IsNullOrEmpty(initialUid) || previews[initialUid].Status != MapStatus.Available)
 			{
-				var selected = previews.Values.Where(x => x.SuitableForInitialMap).RandomOrDefault(random) ??
+				var selected = previews.Values.Where(IsSuitableInitialMap).RandomOrDefault(random) ??
 					previews.Values.First(m => m.Status == MapStatus.Available && m.Visibility.HasFlag(MapVisibility.Lobby));
 				return selected.Uid;
 			}
diff --git a/OpenRA.Game/Map/MapPreview.cs b/OpenRA.Game/Map/MapPreview.cs
index d8e10f8445..5a828b1889 100644
--- a/OpenRA.Game/Map/MapPreview.cs
+++ b/OpenRA.Game/Map/MapPreview.cs
@@ -76,7 +76,6 @@ namespace OpenRA
 			public MapStatus Status;
 			public MapClassification Class;
 			public MapVisibility Visibility;
-			public bool SuitableForInitialMap;
 
 			Lazy<Ruleset> rules;
 			public Ruleset Rules { get { return rules != null ? rules.Value : null; } }
@@ -146,7 +145,6 @@ namespace OpenRA
 		public MapStatus Status { get { return innerData.Status; } }
 		public MapClassification Class { get { return innerData.Class; } }
 		public MapVisibility Visibility { get { return innerData.Visibility; } }
-		public bool SuitableForInitialMap { get { return innerData.SuitableForInitialMap; } }
 
 		public Ruleset Rules { get { return innerData.Rules; } }
 		public bool InvalidCustomRules { get { return innerData.InvalidCustomRules; } }
@@ -208,7 +206,6 @@ namespace OpenRA
 				Status = MapStatus.Unavailable,
 				Class = MapClassification.Unknown,
 				Visibility = MapVisibility.Lobby,
-				SuitableForInitialMap = false
 			};
 		}
 
@@ -295,7 +292,6 @@ namespace OpenRA
 				{
 					newData.Players = new MapPlayers(playerDefinitions.Nodes);
 					newData.PlayerCount = newData.Players.Players.Count(x => x.Value.Playable);
-					newData.SuitableForInitialMap = EvaluateUserFriendliness(newData.Players.Players);
 				}
 			}
 			catch (Exception)
@@ -335,26 +331,6 @@ namespace OpenRA
 			return node;
 		}
 
-		bool EvaluateUserFriendliness(Dictionary<string, PlayerReference> players)
-		{
-			if (Status != MapStatus.Available || !Visibility.HasFlag(MapVisibility.Lobby))
-				return false;
-
-			// Other map types may have confusing settings or gameplay
-			if (!Categories.Contains("Conquest"))
-				return false;
-
-			// Maps with bots disabled confuse new players
-			if (players.Any(x => !x.Value.AllowBots))
-				return false;
-
-			// Large maps expose unfortunate performance problems
-			if (Bounds.Width > 128 || Bounds.Height > 128)
-				return false;
-
-			return true;
-		}
-
 		public void PreloadRules()
 		{
 			var unused = Rules;