From 5faab7f47ef61b18697f896b3acfccd88032f0db Mon Sep 17 00:00:00 2001
From: Larry Safran <lsafran@google.com>
Date: Wed, 7 Feb 2024 15:05:21 -0800
Subject: [PATCH] Revert "Fix retries that timeout hanging forever. (#10855)"
 (#10901)

This reverts commit c0a9d315d3cb9dde3658de310dbea4d223ed415b.
---
 core/src/main/java/io/grpc/internal/RetriableStream.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/src/main/java/io/grpc/internal/RetriableStream.java b/core/src/main/java/io/grpc/internal/RetriableStream.java
index cb8904a7fe0..f301eee1f98 100644
--- a/core/src/main/java/io/grpc/internal/RetriableStream.java
+++ b/core/src/main/java/io/grpc/internal/RetriableStream.java
@@ -195,10 +195,7 @@ public void run() {
             }
           }
           if (retryFuture != null) {
-            boolean cancelled = retryFuture.cancel(false);
-            if (cancelled) {
-              inFlightSubStreams.decrementAndGet();
-            }
+            retryFuture.cancel(false);
           }
           if (hedgingFuture != null) {
             hedgingFuture.cancel(false);