Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes

1 files changed, 0 insertions, 3 deletions

diff --git a/synapse/federation/units.py b/synapse/federation/units.py

index c5ab14314e..025a79c022 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -117,9 +117,6 @@ class Transaction(JsonEncodedObject):
                 "Require 'transaction_id' to construct a Transaction"
             )
 
-        for p in pdus:
-            p.transaction_id = kwargs["transaction_id"]
-
         kwargs["pdus"] = [p.get_pdu_json() for p in pdus]
 
         return Transaction(**kwargs)