diff --git a/mods/default/models/glass.obj b/mods/default/models/glass.obj
new file mode 100644
index 00000000..497822ea
--- /dev/null
+++ b/mods/default/models/glass.obj
@@ -0,0 +1,46 @@
+# Blender v2.79 (sub 0) OBJ File: ''
+# www.blender.org
+mtllib glass.mtl
+o Cube
+v -0.499000 -0.499000 0.499000
+v -0.499000 0.499000 0.499000
+v -0.499000 0.499000 -0.499000
+v -0.499000 -0.499000 -0.499000
+v 0.499000 0.499000 -0.499000
+v 0.499000 -0.499000 -0.499000
+v 0.499000 0.499000 0.499000
+v 0.499000 -0.499000 0.499000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vn -1.0000 0.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+vn 1.0000 -0.0000 0.0000
+vn 0.0000 -0.0000 1.0000
+vn 0.0000 -1.0000 -0.0000
+vn 0.0000 1.0000 0.0000
+usemtl Material.002
+s off
+f 1/1/1 2/2/1 3/3/1 4/4/1
+f 4/5/2 3/6/2 5/7/2 6/8/2
+f 6/9/3 5/10/3 7/11/3 8/12/3
+f 8/13/4 7/14/4 2/15/4 1/16/4
+f 4/5/5 6/17/5 8/18/5 1/16/5
+f 5/19/6 3/6/6 2/15/6 7/20/6
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index cee1242a..81651a81 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -2789,20 +2789,22 @@ default.register_fence_rail("default:fence_rail_aspen_wood", {
 
 minetest.register_node("default:glass", {
 	description = S("Glass"),
-	drawtype = "glasslike_framed_optional",
-	tiles = {"default_glass.png", "default_glass_detail.png"},
+	drawtype = "mesh",
+	mesh = "glass.obj",
+	tiles = {"default_glass.png"},
 	paramtype = "light",
 	paramtype2 = "glasslikeliquidlevel",
-	sunlight_propagates = true,
 	is_ground_content = false,
+	sunlight_propagates = true,
 	groups = {cracky = 3, oddly_breakable_by_hand = 3},
 	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("default:obsidian_glass", {
 	description = S("Obsidian Glass"),
-	drawtype = "glasslike_framed_optional",
-	tiles = {"default_obsidian_glass.png", "default_obsidian_glass_detail.png"},
+	drawtype = "mesh",
+	mesh = "glass.obj",
+	tiles = {"default_obsidian_glass.png"},
 	paramtype = "light",
 	paramtype2 = "glasslikeliquidlevel",
 	is_ground_content = false,