undo more dbkr

2 files changed, 8 insertions, 8 deletions

diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index 6b9cdac9b5..cb93b4c205 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -126,13 +126,13 @@ class DeviceWorkerHandler(BaseHandler):
             user_id
         )
 
-        tracked_users = set(users_who_share_room)
+        #tracked_users = set(users_who_share_room)
 
         # Always tell the user about their own devices
-        tracked_users.add(user_id)
+        #tracked_users.add(user_id)
 
         changed = yield self.store.get_users_whose_devices_changed(
-            from_token.device_list_key, tracked_users
+            from_token.device_list_key, users_who_share_room
         )
 
         # Then work out if any users have since joined
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index bec0e7c5d1..6a8a117841 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -1150,15 +1150,15 @@ class SyncHandler(object):
             # Always tell the user about their own devices. We check as the user
             # ID is almost certainly already included (unless they're not in any
             # rooms) and taking a copy of the set is relatively expensive.
-            if user_id not in users_who_share_room:
-                users_who_share_room = set(users_who_share_room)
-                users_who_share_room.add(user_id)
+            #if user_id not in users_who_share_room:
+            #    users_who_share_room = set(users_who_share_room)
+            #    users_who_share_room.add(user_id)
 
-            tracked_users = users_who_share_room
+            #tracked_users = users_who_share_room
 
             # Step 1a, check for changes in devices of users we share a room with
             users_that_have_changed = await self.store.get_users_whose_devices_changed(
-                since_token.device_list_key, tracked_users
+                since_token.device_list_key, users_who_share_room
             )
 
             # Step 1b, check for newly joined rooms