                                         # Setup the killfeed, which if it sees any activity results in the
                                         # feed sending out an error and also being killed.
                                         @_change_feeds[changefeed_id].push(killfeed)  # make sure this feed is also closed
-                                        killfeed_state = 'initializing'  # killfeeds should have {includeStates: true}
+                                        killfeed_state = 'initializing'  # killfeeds should have {includeStates: false}
                                         killfeed.each (err, val) =>
-                                            if not err and val?.state?
-                                                # info about the state of the changefeed -- may be producing initial docs or new ones
-                                                killfeed_state = val.state
-                                                return
-                                            if not err and killfeed_state != 'ready'
-                                                # still producing initial docs
-                                                return
+                                            #if not err and val?.state?
+                                            #    # info about the state of the changefeed -- may be producing initial docs or new ones
+                                            #    killfeed_state = val.state
+                                            #    return
+                                            #if not err and killfeed_state != 'ready'
+                                            #    # still producing initial docs
+                                            #    return
                                             # TODO: an optimization for some kinds of killfeeds would be to track what we really care about,
                                             # e.g., the list of project_id's, and only if that changes actually force reset below.
                                             # Send an error via the callback; the client *should* take this as a sign

                                        # I think that plucking only the project_id should work, but it actually doesn't
                                        # (I don't understand why yet).
                                        # Changeeds are tricky!
                                        @table('projects').getAll(opts.account_id, index:'users').pluck('users').changes(includeStates: true).run (err, feed) =>
                                            killfeed = feed; cb(err)
                                    else
                                        cb()
                    else if x == "collaborators"

                                    @_change_feeds[changefeed_id] = [feed]
                                    changefeed_state = 'initializing'
                                    feed.each (err, x) =>
                                        #if x?.state?
                                        #    changefeed_state = x.state
                                        #if not err and changefeed_state != 'ready'
                                        #    # still producing initial documents (happens with some queries)
                                        #    return
                                        winston.debug("FEED #{changefeed_id} -- saw a change! #{misc.to_json([err,x])}")
                                        if not err
                                            @_query_set_defaults(x.new_val, opts.table, misc.keys(opts.query))
