this may be a terrible idea

StackExchange.Redis/ChannelMessageQueue.cs

@@ -151,12 +151,10 @@ private void AssertOnMessage(Delegate handler)
         public void OnMessage(Action<ChannelMessage> handler)
         {
             AssertOnMessage(handler);
-            using (ExecutionContext.SuppressFlow())
-            {
+
             ThreadPool.QueueUserWorkItem(
             state => ((ChannelMessageQueue)state).OnMessageSyncImpl(), this);
         }
-        }
 
         private async void OnMessageSyncImpl()
         {
@@ -184,12 +182,10 @@ private async void OnMessageSyncImpl()
         public void OnMessage(Func<ChannelMessage, Task> handler)
         {
             AssertOnMessage(handler);
-            using (ExecutionContext.SuppressFlow())
-            {
+
             ThreadPool.QueueUserWorkItem(
                 state => ((ChannelMessageQueue)state).OnMessageAsyncImpl(), this);
         }
-        }
 
         private async void OnMessageAsyncImpl()
         {

StackExchange.Redis/ConnectionMultiplexer.cs

@@ -857,7 +857,7 @@ public static ConnectionMultiplexer Connect(string configuration, TextWriter log
         /// <param name="log">The <see cref="TextWriter"/> to log to.</param>
         public static ConnectionMultiplexer Connect(ConfigurationOptions configuration, TextWriter log = null)
         {
-            using (ExecutionContext.SuppressFlow())
+            using (ExecutionContext.IsFlowSuppressed() ? null : (AsyncFlowControl?)ExecutionContext.SuppressFlow())
             {
                 return ConnectImpl(() => CreateMultiplexer(configuration), log);
             }

StackExchange.Redis/PhysicalBridge.cs

@@ -669,7 +669,7 @@ private PhysicalConnection GetConnection(TextWriter log)
                             // in that case PhysicalConnection will call back to PhysicalBridge, and most of  PhysicalBridge methods assumes that physical is not null;
                             physical = new PhysicalConnection(this);
 
-                            using (ExecutionContext.SuppressFlow())
+                            using (ExecutionContext.IsFlowSuppressed() ? null : (AsyncFlowControl?)ExecutionContext.SuppressFlow())
                             {
                                 physical.BeginConnectAsync(log);
                             }

StackExchange.Redis/PhysicalConnection.cs

@@ -1496,7 +1496,7 @@ private static RawResult ReadLineTerminatedString(ResultType type, ref BufferRea
 
         internal void StartReading()
         {
-            using (ExecutionContext.SuppressFlow())
+            using (ExecutionContext.IsFlowSuppressed() ? null : (AsyncFlowControl?)ExecutionContext.SuppressFlow())
             {
                 ReadFromPipe();
             }