diff --git a/add_curve_sapling/utils.py b/add_curve_sapling/utils.py
index 2aae8a624c4c0d86c3290d0a955f24e2eab78b55..cba70ab06f22611b0ca9588f376a7a42dd0d907c 100644
--- a/add_curve_sapling/utils.py
+++ b/add_curve_sapling/utils.py
@@ -761,15 +761,19 @@ def addTree(props):
             bpy.context.scene.objects.link(leafObj)
             leafObj.parent = treeOb
             leafMesh.from_pydata(leafVerts,(),leafFaces)
-            leafMesh.validate()
 
-            '''
-            # TODO: Broken after Bmesh merger, disable for now since default uvs are OK
             if leafShape == 'rect':
-                uv = leafMesh.uv_textures.new("leafUV")
-                for tf in uv.data:
-                    tf.uv1, tf.uv2, tf.uv3, tf.uv4 = Vector((1, 0)), Vector((1, 1)), Vector((1 - leafScaleX, 1)), Vector((1 - leafScaleX, 0))
-            '''
+                leafMesh.uv_textures.new("leafUV")
+                uvlayer = leafMesh.uv_layers.active.data
+
+                for i in range(0, len(leafFaces)):
+                    uvlayer[i*4 + 0].uv = Vector((1, 0))
+                    uvlayer[i*4 + 1].uv = Vector((1, 1))
+                    uvlayer[i*4 + 2].uv = Vector((1 - leafScaleX, 1))
+                    uvlayer[i*4 + 3].uv = Vector((1 - leafScaleX, 0))
+
+            leafMesh.validate()
+
 # This can be used if we need particle leaves
 #            if (storeN == levels-1) and leaves:
 #                normalList = []