diff --git a/src/Layout-test-utils.js b/src/Layout-test-utils.js
index 9742009c..86c3588f 100644
--- a/src/Layout-test-utils.js
+++ b/src/Layout-test-utils.js
@@ -51,8 +51,20 @@ var layoutTestUtils = (function() {
       node.children.forEach(fillNodes);
     }
 
+    function extractNodes(node) {
+      var layout = node.layout;
+      delete node.layout;
+      if (node.children.length > 0) {
+        layout.children = node.children.map(extractNodes);
+      } else {
+        delete node.children;
+      }
+      return layout;
+    }
+
     fillNodes(rootNode);
-    return realComputeLayout(rootNode);
+    realComputeLayout(rootNode);
+    return extractNodes(rootNode);
   }
 
   function computeDOMLayout(node) {
diff --git a/src/Layout.js b/src/Layout.js
index 567de0f7..129eb290 100755
--- a/src/Layout.js
+++ b/src/Layout.js
@@ -1,17 +1,6 @@
 
 var computeLayout = (function() {
 
-  function extractNodes(node) {
-    var layout = node.layout;
-    delete node.layout;
-    if (node.children.length > 0) {
-      layout.children = node.children.map(extractNodes);
-    } else {
-      delete node.children;
-    }
-    return layout;
-  }
-
   function capitalizeFirst(str) {
     return str.charAt(0).toUpperCase() + str.slice(1);
   }
@@ -198,7 +187,7 @@ var computeLayout = (function() {
   var CSS_POSITION_RELATIVE = 'relative';
   var CSS_POSITION_ABSOLUTE = 'absolute';
 
-  function layoutNode(node) {
+  return function layoutNode(node) {
     var/*css_flex_direction_t*/ mainAxis = getFlexDirection(node);
     var/*css_flex_direction_t*/ crossAxis = mainAxis === CSS_FLEX_DIRECTION_ROW ?
       CSS_FLEX_DIRECTION_COLUMN :
@@ -459,13 +448,6 @@ var computeLayout = (function() {
       }
     }
   }
-
-  var fn = function(node) {
-    layoutNode(node);
-    return extractNodes(node);
-  };
-  fn.layoutNode = layoutNode;
-  return fn;
 })();