diff --git a/lib/handlebars/compiler/compiler.js b/lib/handlebars/compiler/compiler.js
index 534ddb85..71e0ccf8 100644
--- a/lib/handlebars/compiler/compiler.js
+++ b/lib/handlebars/compiler/compiler.js
@@ -98,13 +98,7 @@ Compiler.prototype = {
     this.usePartial = this.usePartial || result.usePartial;
 
     this.children[guid] = result;
-
-    for(var i=0, l=result.depths.list.length; i<l; i++) {
-      depth = result.depths.list[i];
-
-      if(depth < 2) { continue; }
-      else { this.addDepth(depth - 1); }
-    }
+    this.useDepths = this.useDepths || result.useDepths;
 
     return guid;
   },
@@ -125,9 +119,6 @@ Compiler.prototype = {
 
     this.isSimple = l === 1;
 
-    this.depths.list = this.depths.list.sort(function(a, b) {
-      return a - b;
-    });
 
     return this;
   },
@@ -303,12 +294,11 @@ Compiler.prototype = {
   },
 
   addDepth: function(depth) {
-    if(depth === 0) { return; }
-
-    if(!this.depths[depth]) {
-      this.depths[depth] = true;
-      this.depths.list.push(depth);
+    if (!depth) {
+      return;
     }
+
+    this.useDepths = true;
   },
 
   classifySexpr: function(sexpr) {
diff --git a/lib/handlebars/compiler/javascript-compiler.js b/lib/handlebars/compiler/javascript-compiler.js
index 537d1b09..dfe2df12 100644
--- a/lib/handlebars/compiler/javascript-compiler.js
+++ b/lib/handlebars/compiler/javascript-compiler.js
@@ -80,7 +80,7 @@ JavaScriptCompiler.prototype = {
 
     this.compileChildren(environment, options);
 
-    this.useDepths = this.useDepths || environment.depths.list.length || this.options.compat;
+    this.useDepths = this.useDepths || environment.useDepths || this.options.compat;
 
     var opcodes = environment.opcodes,
         opcode,
@@ -710,9 +710,7 @@ JavaScriptCompiler.prototype = {
 
   programExpression: function(guid) {
     var child = this.environment.children[guid],
-        depths = child.depths.list,
-        useDepths = this.useDepths,
-        depth;
+        useDepths = this.useDepths;
 
     var programParams = [child.index, 'data'];