diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index 6cd8361e..caa4e685 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -76,12 +76,6 @@ var EditSession = function(text, mode) {
         this.setMode(mode);
     else
         this.setMode(new TextMode());
-
-    // Set the initial foldData content.
-    var foldData = this.$foldData = [];
-    for (var row = 0; row < this.doc.$lines.length; row++) {
-        foldData.push(false);
-    }
 };
 
 
diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js
index 68f7fef5..ba4d2492 100644
--- a/lib/ace/layer/text.js
+++ b/lib/ace/layer/text.js
@@ -465,7 +465,7 @@ var Text = function(parentEl) {
                 });
             } else {
                 if (isNewRow) {
-                   tokens = this.tokenizer.getTokens(row, row)[0].tokens;
+                   tokens = this.session.getTokens(row, row)[0].tokens;
                 }
                 if (tokens.length != 0) {
                     addTokens(tokens, lastColumn, column);