diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua
index d311c4f..464527b 100644
--- a/data/mods/default/init.lua
+++ b/data/mods/default/init.lua
@@ -62,6 +62,11 @@
 
 -- print("minetest dump: "..dump(minetest))
 
+WATER_ALPHA = 160
+WATER_VISC = 1
+LAVA_VISC = 7
+LIGHT_MAX = 14
+
 --
 -- Tool definition
 --
@@ -658,6 +663,7 @@ minetest.register_node("dirt_with_grass_footsteps", {
 	inventory_image = "grass_footsteps.png",
 	is_ground_content = true,
 	material = digprop_dirtlike(1.0),
+	dug_item = 'NodeItem "dirt" 1',
 })
 
 minetest.register_node("dirt", {
@@ -667,6 +673,432 @@ minetest.register_node("dirt", {
 	material = digprop_dirtlike(1.0),
 })
 
+minetest.register_node("sand", {
+	tile_images = {"sand.png"},
+	inventory_image = inventorycube("sand.png"),
+	is_ground_content = true,
+	material = digprop_dirtlike(1.0),
+})
+
+minetest.register_node("gravel", {
+	tile_images = {"gravel.png"},
+	inventory_image = inventorycube("gravel.png"),
+	is_ground_content = true,
+	material = digprop_gravellike(1.0),
+})
+
+minetest.register_node("sandstone", {
+	tile_images = {"sandstone.png"},
+	inventory_image = inventorycube("sandstone.png"),
+	is_ground_content = true,
+	material = digprop_dirtlike(1.0),  -- FIXME should this be stonelike?
+	dug_item = 'NodeItem "sand" 1',  -- FIXME is this intentional?
+})
+
+minetest.register_node("clay", {
+	tile_images = {"clay.png"},
+	inventory_image = inventorycube("clay.png"),
+	is_ground_content = true,
+	material = digprop_dirtlike(1.0),
+	dug_item = 'CraftItem "lump_of_clay" 4',
+})
+
+minetest.register_node("brick", {
+	tile_images = {"brick.png"},
+	inventory_image = inventorycube("brick.png"),
+	is_ground_content = true,
+	material = digprop_stonelike(1.0),
+	dug_item = 'CraftItem "clay_brick" 4',
+})
+
+minetest.register_node("tree", {
+	tile_images = {"tree_top.png", "tree_top.png", "tree.png"},
+	inventory_image = inventorycube("tree_top.png", "tree.png", "tree.png"),
+	is_ground_content = true,
+	material = digprop_woodlike(1.0),
+	cookresult_item = 'CraftItem "lump_of_coal" 1',
+	furnace_burntime = 30,
+})
+
+minetest.register_node("jungletree", {
+	tile_images = {"jungletree_top.png", "jungletree_top.png", "jungletree.png"},
+	inventory_image = inventorycube("jungletree_top.png", "jungletree.png", "jungletree.png"),
+	is_ground_content = true,
+	material = digprop_woodlike(1.0),
+	cookresult_item = 'CraftItem "lump_of_coal" 1',
+	furnace_burntime = 30,
+})
+
+minetest.register_node("junglegrass", {
+	drawtype = "plantlike",
+	visual_scale = 1.3,
+	tile_images = {"junglegrass.png"},
+	inventory_image = "junglegrass.png",
+	light_propagates = true,
+	paramtype = "light",
+	walkable = false,
+	material = digprop_leaveslike(1.0),
+	furnace_burntime = 2,
+})
+
+minetest.register_node("leaves", {
+	drawtype = "allfaces_optional",
+	visual_scale = 1.3,
+	tile_images = {"leaves.png"},
+	inventory_image = "leaves.png",
+	light_propagates = true,
+	paramtype = "light",
+	material = digprop_leaveslike(1.0),
+	extra_dug_item = 'NodeItem "sapling" 1',
+	extra_dug_item_rarity = 20,
+	furnace_burntime = 1,
+})
+
+minetest.register_node("cactus", {
+	tile_images = {"cactus_top.png", "cactus_top.png", "cactus_side.png"},
+	inventory_image = inventorycube("cactus_top.png", "cactus_side.png", "cactus_side.png"),
+	is_ground_content = true,
+	material = digprop_woodlike(0.75),
+	furnace_burntime = 15,
+})
+
+minetest.register_node("papyrus", {
+	drawtype = "plantlike",
+	tile_images = {"papyrus.png"},
+	inventory_image = "papyrus.png",
+	light_propagates = true,
+	paramtype = "light",
+	is_ground_content = true,
+	walkable = false,
+	material = digprop_leaveslike(0.5),
+	furnace_burntime = 1,
+})
+
+minetest.register_node("bookshelf", {
+	tile_images = {"wood.png", "wood.png", "bookshelf.png"},
+	-- FIXME: inventorycube only cares for the first texture
+	--inventory_image = inventorycube("wood.png", "bookshelf.png", "bookshelf.png")
+	inventory_image = inventorycube("bookshelf.png"),
+	is_ground_content = true,
+	material = digprop_woodlike(0.75),
+	furnace_burntime = 30,
+})
+
+minetest.register_node("glass", {
+	drawtype = "glasslike",
+	tile_images = {"glass.png"},
+	inventory_image = inventorycube("glass.png"),
+	light_propagates = true,
+	paramtype = "light",
+	sunlight_propagates = true,
+	is_ground_content = true,
+	material = digprop_glasslike(1.0),
+})
+
+minetest.register_node("wooden_fence", {
+	drawtype = "fencelike",
+	tile_images = {"wood.png"},
+	inventory_image = "fence.png",
+	light_propagates = true,
+	paramtype = "light",
+	is_ground_content = true,
+	selection_box = {
+		type = "fixed",
+		fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
+	},
+	furnace_burntime = 15,
+	material = digprop_woodlike(0.75),
+})
+
+minetest.register_node("rail", {
+	drawtype = "raillike",
+	tile_images = {"rail.png", "rail_curved.png", "rail_t_junction.png", "rail_crossing.png"},
+	inventory_image = "rail.png",
+	light_propagates = true,
+	paramtype = "light",
+	is_ground_content = true,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		--fixed = <default>
+	},
+	material = digprop_dirtlike(0.75),
+})
+
+minetest.register_node("ladder", {
+	drawtype = "signlike",
+	tile_images = {"ladder.png"},
+	inventory_image = "ladder.png",
+	light_propagates = true,
+	paramtype = "light",
+	is_ground_content = true,
+	wall_mounted = true,
+	walkable = false,
+	climbable = true,
+	selection_box = {
+		type = "wallmounted",
+		--wall_top = = <default>
+		--wall_bottom = = <default>
+		--wall_side = = <default>
+	},
+	furnace_burntime = 5,
+	material = digprop_woodlike(0.5),
+})
+
+minetest.register_node("coalstone", {
+	tile_images = {"stone.png^mineral_coal.png"},
+	inventory_image = "stone.png^mineral_coal.png",
+	is_ground_content = true,
+	material = digprop_stonelike(1.5),
+})
+
+minetest.register_node("wood", {
+	tile_images = {"wood.png"},
+	inventory_image = inventorycube("wood.png"),
+	is_ground_content = true,
+	furnace_burntime = 7,
+	material = digprop_woodlike(0.75),
+})
+
+minetest.register_node("mese", {
+	tile_images = {"mese.png"},
+	inventory_image = inventorycube("mese.png"),
+	is_ground_content = true,
+	furnace_burntime = 30,
+	material = digprop_stonelike(0.5),
+})
+
+minetest.register_node("cloud", {
+	tile_images = {"cloud.png"},
+	inventory_image = inventorycube("cloud.png"),
+	is_ground_content = true,
+})
+
+minetest.register_node("water_flowing", {
+	drawtype = "flowingliquid",
+	tile_images = {"water.png"},
+	alpha = WATER_ALPHA,
+	inventory_image = inventorycube("water.png"),
+	paramtype = "light",
+	light_propagates = true,
+	walkable = false,
+	pointable = false,
+	diggable = false,
+	buildable_to = true,
+	liquidtype = "flowing",
+	liquid_alternative_flowing = "water_flowing",
+	liquid_alternative_source = "water_source",
+	liquid_viscosity = WATER_VISC,
+	post_effect_color = {a=64, r=100, g=100, b=200},
+	special_materials = {
+		{image="water.png", backface_culling=false},
+		{image="water.png", backface_culling=true},
+	},
+})
+
+minetest.register_node("water_source", {
+	drawtype = "liquid",
+	tile_images = {"water.png"},
+	alpha = WATER_ALPHA,
+	inventory_image = inventorycube("water.png"),
+	paramtype = "light",
+	light_propagates = true,
+	walkable = false,
+	pointable = false,
+	diggable = false,
+	buildable_to = true,
+	liquidtype = "source",
+	liquid_alternative_flowing = "water_flowing",
+	liquid_alternative_source = "water_source",
+	liquid_viscosity = WATER_VISC,
+	post_effect_color = {a=64, r=100, g=100, b=200},
+	special_materials = {
+		-- New-style water source material (mostly unused)
+		{image="water.png", backface_culling=false},
+	},
+})
+
+minetest.register_node("lava_flowing", {
+	drawtype = "flowingliquid",
+	tile_images = {"lava.png"},
+	inventory_image = inventorycube("lava.png"),
+	paramtype = "light",
+	light_propagates = false,
+	light_source = LIGHT_MAX - 1,
+	walkable = false,
+	pointable = false,
+	diggable = false,
+	buildable_to = true,
+	liquidtype = "flowing",
+	liquid_alternative_flowing = "lava_flowing",
+	liquid_alternative_source = "lava_source",
+	liquid_viscosity = LAVA_VISC,
+	damage_per_second = 4*2,
+	post_effect_color = {a=192, r=255, g=64, b=0},
+	special_materials = {
+		{image="lava.png", backface_culling=false},
+		{image="lava.png", backface_culling=true},
+	},
+})
+
+minetest.register_node("lava_source", {
+	drawtype = "liquid",
+	tile_images = {"lava.png"},
+	inventory_image = inventorycube("lava.png"),
+	paramtype = "light",
+	light_propagates = false,
+	light_source = LIGHT_MAX - 1,
+	walkable = false,
+	pointable = false,
+	diggable = false,
+	buildable_to = true,
+	liquidtype = "source",
+	liquid_alternative_flowing = "lava_flowing",
+	liquid_alternative_source = "lava_source",
+	liquid_viscosity = LAVA_VISC,
+	damage_per_second = 4*2,
+	post_effect_color = {a=192, r=255, g=64, b=0},
+	special_materials = {
+		-- New-style lava source material (mostly unused)
+		{image="lava.png", backface_culling=false},
+	},
+	furnace_burntime = 60,
+})
+
+minetest.register_node("torch", {
+	drawtype = "torchlike",
+	tile_images = {"torch_on_floor.png", "torch_on_ceiling.png", "torch.png"},
+	inventory_image = "torch_on_floor.png",
+	paramtype = "light",
+	light_propagates = true,
+	sunlight_propagates = true,
+	walkable = false,
+	wall_mounted = true,
+	light_source = LIGHT_MAX-1,
+	selection_box = {
+		type = "wallmounted",
+		wall_top = {-0.1, 0.5-0.6, -0.1, 0.1, 0.5, 0.1},
+		wall_bottom = {-0.1, -0.5, -0.1, 0.1, -0.5+0.6, 0.1},
+		wall_side = {-0.5, -0.3, -0.1, -0.5+0.3, 0.3, 0.1},
+	},
+	material = digprop_constanttime(0.0),
+	furnace_burntime = 4,
+})
+
+minetest.register_node("sign_wall", {
+	drawtype = "signlike",
+	tile_images = {"sign_wall.png"},
+	inventory_image = "sign_wall.png",
+	paramtype = "light",
+	light_propagates = true,
+	sunlight_propagates = true,
+	walkable = false,
+	wall_mounted = true,
+	metadata_name = "sign",
+	selection_box = {
+		type = "wallmounted",
+		--wall_top = <default>
+		--wall_bottom = <default>
+		--wall_side = <default>
+	},
+	material = digprop_constanttime(0.5),
+	furnace_burntime = 10,
+})
+
+minetest.register_node("chest", {
+	tile_images = {"chest_top.png", "chest_top.png", "chest_side.png",
+		"chest_side.png", "chest_side.png", "chest_front.png"},
+	inventory_image = "chest_top.png",
+	--inventory_image = inventorycube("chest_top.png", "chest_side.png", "chest_front.png"),
+	paramtype = "facedir_simple",
+	metadata_name = "chest",
+	material = digprop_woodlike(1.0),
+	furnace_burntime = 30,
+})
+
+minetest.register_node("locked_chest", {
+	tile_images = {"chest_top.png", "chest_top.png", "chest_side.png",
+		"chest_side.png", "chest_side.png", "chest_lock.png"},
+	inventory_image = "chest_lock.png",
+	paramtype = "facedir_simple",
+	metadata_name = "locked_chest",
+	material = digprop_woodlike(1.0),
+	furnace_burntime = 30,
+})
+
+minetest.register_node("furnace", {
+	tile_images = {"furnace_side.png", "furnace_side.png", "furnace_side.png",
+		"furnace_side.png", "furnace_side.png", "furnace_front.png"},
+	inventory_image = "furnace_front.png",
+	paramtype = "facedir_simple",
+	metadata_name = "furnace",
+	material = digprop_stonelike(3.0),
+})
+
+minetest.register_node("cobble", {
+	tile_images = {"cobble.png"},
+	inventory_image = inventorycube("cobble.png"),
+	is_ground_content = true,
+	cookresult_item = 'NodeItem "stone" 1',
+	material = digprop_stonelike(0.9),
+})
+
+minetest.register_node("mossycobble", {
+	tile_images = {"mossycobble.png"},
+	inventory_image = inventorycube("mossycobble.png"),
+	is_ground_content = true,
+	material = digprop_stonelike(0.8),
+})
+
+minetest.register_node("steelblock", {
+	tile_images = {"steel_block.png"},
+	inventory_image = inventorycube("steel_block.png"),
+	is_ground_content = true,
+	material = digprop_stonelike(5.0),
+})
+
+minetest.register_node("nyancat", {
+	tile_images = {"nc_side.png", "nc_side.png", "nc_side.png",
+		"nc_side.png", "nc_back.png", "nc_front.png"},
+	inventory_image = "nc_front.png",
+	paramtype = "facedir_simple",
+	material = digprop_stonelike(3.0),
+	furnace_burntime = 1,
+})
+
+minetest.register_node("nyancat_rainbow", {
+	tile_images = {"nc_rb.png"},
+	inventory_image = "nc_rb.png",
+	material = digprop_stonelike(3.0),
+	furnace_burntime = 1,
+})
+
+minetest.register_node("sapling", {
+	drawtype = "plantlike",
+	visual_scale = 1.0,
+	tile_images = {"sapling.png"},
+	inventory_image = "sapling.png",
+	paramtype = "light",
+	light_propagates = true,
+	walkable = false,
+	material = digprop_constanttime(0.0),
+	furnace_burntime = 10,
+})
+
+minetest.register_node("apple", {
+	drawtype = "plantlike",
+	visual_scale = 1.0,
+	tile_images = {"apple.png"},
+	inventory_image = "apple.png",
+	paramtype = "light",
+	light_propagates = true,
+	sunlight_propagates = true,
+	walkable = false,
+	dug_item = 'CraftItem "apple" 1',
+	material = digprop_constanttime(0.0),
+	furnace_burntime = 3,
+})
+
 -- New nodes
 
 minetest.register_node("somenode", {
diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index 878d666..a74760b 100644
--- a/src/content_mapnode.cpp
+++ b/src/content_mapnode.cpp
@@ -478,7 +478,6 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr)
 	f.setInventoryTexture("junglegrass.png");
 	f.light_propagates = true;
 	f.param_type = CPT_LIGHT;
-	f.air_equivalent = false; // grass grows underneath
 	f.dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f.walkable = false;
 	setLeavesLikeMaterialProperties(f.material, 1.0);
@@ -568,7 +567,6 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr)
 	f.param_type = CPT_LIGHT;
 	f.is_ground_content = true;
 	f.dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
-	f.air_equivalent = true; // grass grows underneath
 	f.selection_box.type = NODEBOX_FIXED;
 	f.selection_box.fixed = core::aabbox3d<f32>(
 			-BS/7, -BS/2, -BS/7, BS/7, BS/2, BS/7);
@@ -589,7 +587,6 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr)
 	f.param_type = CPT_LIGHT;
 	f.is_ground_content = true;
 	f.dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
-	f.air_equivalent = true; // grass grows underneath
 	f.walkable = false;
 	f.selection_box.type = NODEBOX_FIXED;
 	f.furnace_burntime = 5;
@@ -607,7 +604,6 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr)
 	f.is_ground_content = true;
 	f.dug_item = std::string("MaterialItem ")+itos(i)+" 1";
 	f.wall_mounted = true;
-	f.air_equivalent = true;
 	f.walkable = false;
 	f.climbable = true;
 	f.selection_box.type = NODEBOX_WALLMOUNTED;
@@ -665,7 +661,6 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr)
 	f.pointable = false;
 	f.diggable = false;
 	f.buildable_to = true;
-	f.air_equivalent = true;
 	nodemgr->set(i, f);
 
 	i = CONTENT_WATER;
@@ -774,7 +769,6 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr)
 	f.sunlight_propagates = true;
 	f.walkable = false;
 	f.wall_mounted = true;
-	f.air_equivalent = true;
 	f.dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f.light_source = LIGHT_MAX-1;
 	f.selection_box.type = NODEBOX_WALLMOUNTED;
@@ -799,7 +793,6 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr)
 	f.sunlight_propagates = true;
 	f.walkable = false;
 	f.wall_mounted = true;
-	f.air_equivalent = true;
 	f.dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f.metadata_name = "sign";
 	setConstantMaterialProperties(f.material, 0.5);
@@ -920,7 +913,6 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr)
 	f.param_type = CPT_LIGHT;
 	f.dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f.light_propagates = true;
-	f.air_equivalent = false;
 	f.walkable = false;
 	setConstantMaterialProperties(f.material, 0.0);
 	f.furnace_burntime = 10;
@@ -937,7 +929,6 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr)
 	f.light_propagates = true;
 	f.sunlight_propagates = true;
 	f.walkable = false;
-	f.air_equivalent = true;
 	f.dug_item = std::string("CraftItem apple 1");
 	setConstantMaterialProperties(f.material, 0.0);
 	f.furnace_burntime = 3;
diff --git a/src/content_mapnode.h b/src/content_mapnode.h
index 57be6da..b928e44 100644
--- a/src/content_mapnode.h
+++ b/src/content_mapnode.h
@@ -28,7 +28,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 class IWritableNodeDefManager;
 
-// Initialize default (legacy) node definitions
+// Initialize legacy node definitions
+// Not used used anywhere else than in test.cpp (and SHALL NOT BE)
 void content_mapnode_init(IWritableNodeDefManager *nodemgr);
 
 // Backwards compatibility for non-extended content types in v19
diff --git a/src/environment.cpp b/src/environment.cpp
index 5206ecc..f1278a6 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -644,7 +644,8 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime)
 			if(dtime_s > 300)
 			{
 				MapNode n_top = block->getNodeNoEx(p0+v3s16(0,1,0));
-				if(m_gamedef->ndef()->get(n_top).air_equivalent &&
+				if(m_gamedef->ndef()->get(n_top).light_propagates &&
+						!m_gamedef->ndef()->get(n_top).isLiquid() &&
 						n_top.getLight(LIGHTBANK_DAY, m_gamedef->ndef()) >= 13)
 				{
 					n.setContent(LEGN(m_gamedef->ndef(), "CONTENT_GRASS"));
@@ -1018,7 +1019,8 @@ void ServerEnvironment::step(float dtime)
 					if(myrand()%20 == 0)
 					{
 						MapNode n_top = m_map->getNodeNoEx(p+v3s16(0,1,0));
-						if(m_gamedef->ndef()->get(n_top).air_equivalent &&
+						if(m_gamedef->ndef()->get(n_top).light_propagates &&
+								!m_gamedef->ndef()->get(n_top).isLiquid() &&
 								n_top.getLightBlend(getDayNightRatio(),
 										m_gamedef->ndef()) >= 13)
 						{
@@ -1035,7 +1037,8 @@ void ServerEnvironment::step(float dtime)
 					//if(myrand()%20 == 0)
 					{
 						MapNode n_top = m_map->getNodeNoEx(p+v3s16(0,1,0));
-						if(m_gamedef->ndef()->get(n_top).air_equivalent == false)
+						if(m_gamedef->ndef()->get(n_top).light_propagates == false ||
+								m_gamedef->ndef()->get(n_top).isLiquid())
 						{
 							n.setContent(LEGN(m_gamedef->ndef(), "CONTENT_MUD"));
 							m_map->addNodeWithEvent(p, n);
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index f1e109b..c2256ce 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -2222,8 +2222,7 @@ void make_block(BlockMakeData *data)
 				{
 					u32 i = data->vmanip->m_area.index(p);
 					MapNode *n = &data->vmanip->m_data[i];
-					if(data->nodedef->get(*n).is_ground_content
-							|| n->getContent() == LEGN(ndef, "CONTENT_JUNGLETREE"))
+					if(data->nodedef->get(*n).is_ground_content)
 					{
 						found = true;
 						break;
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 7855ffe..c5ad3af 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -137,7 +137,6 @@ void ContentFeatures::reset()
 	climbable = false;
 	buildable_to = false;
 	wall_mounted = false;
-	air_equivalent = false;
 	often_contains_mineral = false;
 	dug_item = "";
 	extra_dug_item = "";
@@ -185,7 +184,6 @@ void ContentFeatures::serialize(std::ostream &os)
 	writeU8(os, climbable);
 	writeU8(os, buildable_to);
 	writeU8(os, wall_mounted);
-	writeU8(os, air_equivalent);
 	writeU8(os, often_contains_mineral);
 	os<<serializeString(dug_item);
 	os<<serializeString(extra_dug_item);
@@ -237,7 +235,6 @@ void ContentFeatures::deSerialize(std::istream &is, IGameDef *gamedef)
 	climbable = readU8(is);
 	buildable_to = readU8(is);
 	wall_mounted = readU8(is);
-	air_equivalent = readU8(is);
 	often_contains_mineral = readU8(is);
 	dug_item = deSerializeString(is);
 	extra_dug_item = deSerializeString(is);
@@ -329,7 +326,6 @@ public:
 			f.pointable = false;
 			f.diggable = false;
 			f.buildable_to = true;
-			f.air_equivalent = true;
 			// Insert directly into containers
 			content_t c = CONTENT_AIR;
 			m_content_features[c] = f;
@@ -348,7 +344,6 @@ public:
 			f.diggable = false;
 			// A way to remove accidental CONTENT_IGNOREs
 			f.buildable_to = true;
-			f.air_equivalent = true;
 			// Insert directly into containers
 			content_t c = CONTENT_IGNORE;
 			m_content_features[c] = f;
diff --git a/src/nodedef.h b/src/nodedef.h
index 645e75e..e0b5c86 100644
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -174,9 +174,6 @@ struct ContentFeatures
 	// If true, param2 is set to direction when placed. Used for torches.
 	// NOTE: the direction format is quite inefficient and should be changed
 	bool wall_mounted;
-	// If true, node is equivalent to air. Torches are, air is. Water is not.
-	// Is used for example to check whether a mud block can have grass on.
-	bool air_equivalent;
 	// Whether this content type often contains mineral.
 	// Used for texture atlas creation.
 	// Currently only enabled for CONTENT_STONE.
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index a6ac4a0..d6169cb 100644
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -212,27 +212,27 @@ static video::SColor readARGB8(lua_State *L, int index)
 	return color;
 }
 
-static core::aabbox3d<f32> read_aabbox3df32(lua_State *L, int index)
+static core::aabbox3d<f32> read_aabbox3df32(lua_State *L, int index, f32 scale)
 {
 	core::aabbox3d<f32> box;
 	if(lua_istable(L, -1)){
 		lua_rawgeti(L, -1, 1);
-		box.MinEdge.X = lua_tonumber(L, -1);
+		box.MinEdge.X = lua_tonumber(L, -1) * scale;
 		lua_pop(L, 1);
 		lua_rawgeti(L, -1, 2);
-		box.MinEdge.Y = lua_tonumber(L, -1);
+		box.MinEdge.Y = lua_tonumber(L, -1) * scale;
 		lua_pop(L, 1);
 		lua_rawgeti(L, -1, 3);
-		box.MinEdge.Z = lua_tonumber(L, -1);
+		box.MinEdge.Z = lua_tonumber(L, -1) * scale;
 		lua_pop(L, 1);
 		lua_rawgeti(L, -1, 4);
-		box.MaxEdge.X = lua_tonumber(L, -1);
+		box.MaxEdge.X = lua_tonumber(L, -1) * scale;
 		lua_pop(L, 1);
 		lua_rawgeti(L, -1, 5);
-		box.MaxEdge.Y = lua_tonumber(L, -1);
+		box.MaxEdge.Y = lua_tonumber(L, -1) * scale;
 		lua_pop(L, 1);
 		lua_rawgeti(L, -1, 6);
-		box.MaxEdge.Z = lua_tonumber(L, -1);
+		box.MaxEdge.Z = lua_tonumber(L, -1) * scale;
 		lua_pop(L, 1);
 	}
 	return box;
@@ -600,9 +600,6 @@ static int l_register_node(lua_State *L)
 	// If true, param2 is set to direction when placed. Used for torches.
 	// NOTE: the direction format is quite inefficient and should be changed
 	getboolfield(L, table0, "wall_mounted", f.wall_mounted);
-	// If true, node is equivalent to air. Torches are, air is. Water is not.
-	// Is used for example to check whether a mud block can have grass on.
-	getboolfield(L, table0, "air_equivalent", f.air_equivalent);
 	// Whether this content type often contains mineral.
 	// Used for texture atlas creation.
 	// Currently only enabled for CONTENT_STONE.
@@ -643,22 +640,22 @@ static int l_register_node(lua_State *L)
 
 		lua_getfield(L, -1, "fixed");
 		if(lua_istable(L, -1))
-			f.selection_box.fixed = read_aabbox3df32(L, -1);
+			f.selection_box.fixed = read_aabbox3df32(L, -1, BS);
 		lua_pop(L, 1);
 
 		lua_getfield(L, -1, "wall_top");
 		if(lua_istable(L, -1))
-			f.selection_box.wall_top = read_aabbox3df32(L, -1);
+			f.selection_box.wall_top = read_aabbox3df32(L, -1, BS);
 		lua_pop(L, 1);
 
 		lua_getfield(L, -1, "wall_bottom");
 		if(lua_istable(L, -1))
-			f.selection_box.wall_bottom = read_aabbox3df32(L, -1);
+			f.selection_box.wall_bottom = read_aabbox3df32(L, -1, BS);
 		lua_pop(L, 1);
 
 		lua_getfield(L, -1, "wall_side");
 		if(lua_istable(L, -1))
-			f.selection_box.wall_side = read_aabbox3df32(L, -1);
+			f.selection_box.wall_side = read_aabbox3df32(L, -1, BS);
 		lua_pop(L, 1);
 	}
 	lua_pop(L, 1);
diff --git a/src/server.cpp b/src/server.cpp
index 6d34a0f..7b44b1c 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1021,9 +1021,6 @@ Server::Server(
 
 	infostream<<"m_nodedef="<<m_nodedef<<std::endl;
 	
-	// Initialize default node definitions
-	content_mapnode_init(m_nodedef);
-	
 	// Path to builtin.lua
 	std::string builtinpath = porting::path_data + DIR_DELIM + "builtin.lua";
 	// Add default global mod path