From b282fe7170142191c8ce795270422754ab4bc58e Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 30 Mar 2017 17:03:59 +0100
Subject: [PATCH] Revert log context change

---
 synapse/util/logcontext.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/synapse/util/logcontext.py b/synapse/util/logcontext.py
index 183d9cf62..857afee7c 100644
--- a/synapse/util/logcontext.py
+++ b/synapse/util/logcontext.py
@@ -315,9 +315,6 @@ def preserve_context_over_deferred(deferred, context=None):
     the deferred follow the synapse logcontext rules: try
     ``make_deferred_yieldable`` instead.
     """
-    if not isinstance(deferred, defer.Deferred):
-        return deferred
-
     if context is None:
         context = LoggingContext.current_context()
     d = _PreservingContextDeferred(context)