diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index 496c2d7e..ec0dd4ba 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -752,15 +752,7 @@ var EditSession = function(text, mode) {
     * Sets annotations for the `EditSession`. This functions emits the `'changeAnnotation'` event.
     **/
     this.setAnnotations = function(annotations) {
-        this.$annotations = {};
-        for (var i=0; i<annotations.length; i++) {
-            var annotation = annotations[i];
-            var row = annotation.row;
-            if (this.$annotations[row])
-                this.$annotations[row].push(annotation);
-            else
-                this.$annotations[row] = [annotation];
-        }
+        this.$annotations = annotations;
         this._emit("changeAnnotation", {});
     };
 
diff --git a/lib/ace/layer/gutter.js b/lib/ace/layer/gutter.js
index 798df279..af2deb31 100644
--- a/lib/ace/layer/gutter.js
+++ b/lib/ace/layer/gutter.js
@@ -50,7 +50,7 @@ var Gutter = function(parentEl) {
 (function() {
 
     oop.implement(this, EventEmitter);
-    
+
     this.setSession = function(session) {
         if (this.session)
             this.session.removeEventListener("change", this.$updateAnnotations);
@@ -72,28 +72,25 @@ var Gutter = function(parentEl) {
 
     this.setAnnotations = function(annotations) {
         // iterate over sparse array
-        this.$annotations = [];
-        for (var row in annotations) if (annotations.hasOwnProperty(row)) {
-            var rowAnnotations = annotations[row];
-            if (!rowAnnotations)
-                continue;
-
-            var rowInfo = this.$annotations[row] = {
-                text: []
-            };
-            for (var i=0; i<rowAnnotations.length; i++) {
-                var annotation = rowAnnotations[i];
-                var annoText = annotation.text.replace(/"/g, "&quot;").replace(/'/g, "&#8217;").replace(/</, "&lt;");
-                if (rowInfo.text.indexOf(annoText) === -1)
-                    rowInfo.text.push(annoText);
-                var type = annotation.type;
-                if (type == "error")
-                    rowInfo.className = " ace_error";
-                else if (type == "warning" && rowInfo.className != " ace_error")
-                    rowInfo.className = " ace_warning";
-                else if (type == "info" && (!rowInfo.className))
-                    rowInfo.className = " ace_info";
+        this.$annotations = []
+        var rowInfo, row;
+        for (var i = 0; i < annotations.length; i++) {
+            var annotation = annotations[i];
+            var row = annotation.row;
+            var rowInfo = this.$annotations[row];
+            if (!rowInfo) {
+                rowInfo = this.$annotations[row] = {text: []};
             }
+            var annoText = annotation.text.replace(/"/g, "&quot;").replace(/'/g, "&#8217;").replace(/</g, "&lt;");
+            if (rowInfo.text.indexOf(annoText) === -1)
+                rowInfo.text.push(annoText);
+            var type = annotation.type;
+            if (type == "error")
+                rowInfo.className = " ace_error";
+            else if (type == "warning" && rowInfo.className != " ace_error")
+                rowInfo.className = " ace_warning";
+            else if (type == "info" && (!rowInfo.className))
+                rowInfo.className = " ace_info";
         }
     };