diff --git a/lib/gears/surface.lua b/lib/gears/surface.lua
index 4f24e2345..78f22168e 100644
--- a/lib/gears/surface.lua
+++ b/lib/gears/surface.lua
@@ -209,15 +209,9 @@ end
 local function no_op() end
 
 local function run_in_hierarchy(self, cr, width, height)
-
-    local function redraw(h)
-        h:draw({dpi=96}, cr)
-    end
-
-    local h = hierarchy.new({dpi=96}, self, width, height, redraw, no_op, {})
-
-    redraw(h)
-
+    local context = {dpi=96}
+    local h = hierarchy.new(context, self, width, height, no_op, no_op, {})
+    h:draw(context, cr)
     return h
 end