diff --git a/packages/client-app/src/flux/attributes/attribute-collection.es6 b/packages/client-app/src/flux/attributes/attribute-collection.es6
index 2f7bd4e73..e06772b34 100644
--- a/packages/client-app/src/flux/attributes/attribute-collection.es6
+++ b/packages/client-app/src/flux/attributes/attribute-collection.es6
@@ -76,16 +76,10 @@ export default class AttributeCollection extends Attribute {
 
       if (this.ItemClass.prototype.fromJSON) {
         const obj = new this.ItemClass();
-        // Important: if no ids are in the JSON, don't make them up
-        // randomly.  This causes an object to be "different" each time it's
-        // de-serialized even if it's actually the same, makes React
-        // components re-render!
-        obj.id = undefined;
         obj.fromJSON(objJSON);
         objs.push(obj);
       } else {
         const obj = new this.ItemClass(objJSON);
-        obj.id = undefined;
         objs.push(obj);
       }
     }
diff --git a/packages/client-app/src/flux/models/model.coffee b/packages/client-app/src/flux/models/model.coffee
index 4b7bd4e3e..14a3c64bd 100644
--- a/packages/client-app/src/flux/models/model.coffee
+++ b/packages/client-app/src/flux/models/model.coffee
@@ -38,8 +38,6 @@ class Model
     for key in Object.keys(@constructor.attributes)
       continue unless values[key]?
       @[key] = values[key]
-
-    @id ?= Utils.generateTempId()
     @
 
   isSavedRemotely: ->
diff --git a/packages/client-app/src/flux/models/mutable-query-result-set.es6 b/packages/client-app/src/flux/models/mutable-query-result-set.es6
index a0bc01c07..a92b6ab82 100644
--- a/packages/client-app/src/flux/models/mutable-query-result-set.es6
+++ b/packages/client-app/src/flux/models/mutable-query-result-set.es6
@@ -94,7 +94,6 @@ export default class MutableQueryResultSet extends QueryResultSet {
     }
 
     this._modelsHash[item.id] = item;
-    this._idToIndexHash = null;
   }
 
   removeModelAtOffset(item, offset) {