Merge branch 'release-v0.17.2' of github.com:matrix-org/synapse v0.17.2

1 files changed, 3 insertions, 3 deletions

diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py

index 8a475417a6..e895b1c450 100644
--- a/synapse/events/snapshot.py
+++ b/synapse/events/snapshot.py
@@ -15,9 +15,9 @@
 
 
 class EventContext(object):
-
-    def __init__(self, current_state=None):
-        self.current_state = current_state
+    def __init__(self):
+        self.current_state_ids = None
+        self.prev_state_ids = None
         self.state_group = None
         self.rejected = False
         self.push_actions = []