diff --git a/minetest.conf b/minetest.conf
index f0980b2..462055e 100644
--- a/minetest.conf
+++ b/minetest.conf
@@ -1,5 +1 @@
 # This is a game-specific minetest.conf file, do not edit.
-
-mg_name = v7
-mg_flags = caves
-liquid_finite = 0
diff --git a/mods/base/mapgen.lua b/mods/base/mapgen.lua
index e6a1e0f..c18cef7 100644
--- a/mods/base/mapgen.lua
+++ b/mods/base/mapgen.lua
@@ -21,19 +21,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --
 
 minetest.register_on_mapgen_init(function(params)
-	if
-		params.mgname ~= "v7" or
-		params.water_level ~= 1 or
-		params.flags ~= "caves"
-	then
-		minetest.log("error", "Modified mapgen settings found; resetting")
-		minetest.set_mapgen_params({
-			mgname = "v7",
-			seed = params.seed,
-			water_level = 1,
-			flags = "caves"
-		})
-	end
+	minetest.set_mapgen_params({
+		mgname = "v7",
+		seed = params.seed,
+		water_level = 1,
+		flags = "caves",
+		flagmask = "trees, caves, flat, v6_biome_blend, v6_jungles, dungeons, nolight",
+	})
 end)
 
 minetest.register_alias("mapgen_water_source", "base:water")