diff --git a/OpenRA.Mods.Common/UtilityCommands/CheckSequenceSprites.cs b/OpenRA.Mods.Common/UtilityCommands/CheckSequenceSprites.cs
index b56bb80e31..32df401ae1 100644
--- a/OpenRA.Mods.Common/UtilityCommands/CheckSequenceSprites.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/CheckSequenceSprites.cs
@@ -28,8 +28,6 @@ namespace OpenRA.Mods.Common.UtilityCommands
 		{
 			// HACK: The engine code assumes that Game.modData is set.
 			Game.ModData = modData;
-
-			modData.ModFiles.LoadFromManifest(modData.Manifest);
 			modData.SpriteSequenceLoader.OnMissingSpriteError = s => Console.WriteLine("\t" + s);
 
 			foreach (var t in modData.Manifest.TileSets)
diff --git a/OpenRA.Mods.Common/UtilityCommands/ExtractFilesCommand.cs b/OpenRA.Mods.Common/UtilityCommands/ExtractFilesCommand.cs
index 86bdf7d102..4f57196d18 100644
--- a/OpenRA.Mods.Common/UtilityCommands/ExtractFilesCommand.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/ExtractFilesCommand.cs
@@ -27,11 +27,10 @@ namespace OpenRA.Mods.Common.UtilityCommands
 		public void Run(ModData modData, string[] args)
 		{
 			var files = args.Skip(1);
-			modData.ModFiles.LoadFromManifest(modData.Manifest);
 
 			foreach (var f in files)
 			{
-				var src = modData.ModFiles.Open(f);
+				var src = modData.DefaultFileSystem.Open(f);
 				if (src == null)
 					throw new InvalidOperationException("File not found: {0}".F(f));
 				var data = src.ReadAllBytes();
diff --git a/OpenRA.Mods.Common/UtilityCommands/FixClassicTilesets.cs b/OpenRA.Mods.Common/UtilityCommands/FixClassicTilesets.cs
index a02145962f..cb75142c0f 100644
--- a/OpenRA.Mods.Common/UtilityCommands/FixClassicTilesets.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/FixClassicTilesets.cs
@@ -31,7 +31,6 @@ namespace OpenRA.Mods.Common.UtilityCommands
 		{
 			// HACK: The engine code assumes that Game.modData is set.
 			Game.ModData = modData;
-			modData.ModFiles.LoadFromManifest(modData.Manifest);
 
 			var imageField = typeof(TerrainTemplateInfo).GetField("Image");
 			var pickAnyField = typeof(TerrainTemplateInfo).GetField("PickAny");
@@ -55,7 +54,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					foreach (var ext in exts)
 					{
 						Stream s;
-						if (modData.ModFiles.TryOpen(template.Images[0] + ext, out s))
+						if (modData.DefaultFileSystem.TryOpen(template.Images[0] + ext, out s))
 							s.Dispose();
 						else
 							continue;
diff --git a/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs b/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs
index d7b539af93..8cb3afbba9 100644
--- a/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs
@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
 			Rules = modData.RulesetCache.Load(modData.DefaultFileSystem);
 
 			var filename = args[1];
-			using (var stream = modData.ModFiles.Open(filename))
+			using (var stream = modData.DefaultFileSystem.Open(filename))
 			{
 				var file = new IniFile(stream);
 				var basic = file.GetSection("Basic");
diff --git a/OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs b/OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs
index 39c4a36c69..4c0f95d195 100644
--- a/OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs
+++ b/OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs
@@ -70,10 +70,10 @@ namespace OpenRA.Mods.TS.UtilityCommands
 					for (var i = 1; i <= sectionCount; i++, templateIndex++)
 					{
 						var templateFilename = "{0}{1:D2}.{2}".F(sectionFilename, i, extension);
-						if (!Game.ModData.ModFiles.Exists(templateFilename))
+						if (!modData.DefaultFileSystem.Exists(templateFilename))
 							continue;
 
-						using (var s = Game.ModData.ModFiles.Open(templateFilename))
+						using (var s = modData.DefaultFileSystem.Open(templateFilename))
 						{
 							Console.WriteLine("\tTemplate@{0}:", templateIndex);
 							Console.WriteLine("\t\tCategory: {0}", sectionCategory);
@@ -85,7 +85,7 @@ namespace OpenRA.Mods.TS.UtilityCommands
 							for (var v = 'a'; v <= 'z'; v++)
 							{
 								var variant = "{0}{1:D2}{2}.{3}".F(sectionFilename, i, v, extension);
-								if (Game.ModData.ModFiles.Exists(variant))
+								if (modData.DefaultFileSystem.Exists(variant))
 									images.Add(variant);
 							}