diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
index aeb7389ca21..d032879e836 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -967,50 +967,12 @@ void grpc_chttp2_mark_stream_writable(grpc_chttp2_transport* t,
   }
 }
 
-static grpc_closure_scheduler* write_scheduler(grpc_chttp2_transport* t,
-                                               bool early_results_scheduled,
-                                               bool partial_write) {
-  // If we're already in a background poller, don't offload this to an executor
-  if (grpc_iomgr_is_any_background_poller_thread()) {
-    return grpc_schedule_on_exec_ctx;
-  }
-  /* if it's not the first write in a batch, always offload to the executor:
-     we'll probably end up queuing against the kernel anyway, so we'll likely
-     get better latency overall if we switch writing work elsewhere and continue
-     with application work above */
-  if (!t->is_first_write_in_batch) {
-    return grpc_core::Executor::Scheduler(grpc_core::ExecutorJobType::SHORT);
-  }
-  /* equivalently, if it's a partial write, we *know* we're going to be taking a
-     thread jump to write it because of the above, may as well do so
-     immediately */
-  if (partial_write) {
-    return grpc_core::Executor::Scheduler(grpc_core::ExecutorJobType::SHORT);
-  }
-  switch (t->opt_target) {
-    case GRPC_CHTTP2_OPTIMIZE_FOR_THROUGHPUT:
-      /* executor gives us the largest probability of being able to batch a
-       * write with others on this transport */
-      return grpc_core::Executor::Scheduler(grpc_core::ExecutorJobType::SHORT);
-    case GRPC_CHTTP2_OPTIMIZE_FOR_LATENCY:
-      return grpc_schedule_on_exec_ctx;
-  }
-  GPR_UNREACHABLE_CODE(return nullptr);
-}
-
-#define WRITE_STATE_TUPLE_TO_INT(p, i) (2 * (int)(p) + (int)(i))
-static const char* begin_writing_desc(bool partial, bool inlined) {
-  switch (WRITE_STATE_TUPLE_TO_INT(partial, inlined)) {
-    case WRITE_STATE_TUPLE_TO_INT(false, false):
-      return "begin write in background";
-    case WRITE_STATE_TUPLE_TO_INT(false, true):
-      return "begin write in current thread";
-    case WRITE_STATE_TUPLE_TO_INT(true, false):
-      return "begin partial write in background";
-    case WRITE_STATE_TUPLE_TO_INT(true, true):
-      return "begin partial write in current thread";
-  }
-  GPR_UNREACHABLE_CODE(return "bad state tuple");
+static const char* begin_writing_desc(bool partial) {
+  if (partial) {
+    return "begin partial write in background";
+  } else {
+    return "begin write in current thread";
+  }
 }
 
 static void write_action_begin_locked(void* gt, grpc_error* error_ignored) {
@@ -1030,19 +992,11 @@ static void write_action_begin_locked(void* gt, grpc_error* error_ignored) {
     if (!t->is_first_write_in_batch) {
       GRPC_STATS_INC_HTTP2_WRITES_CONTINUED();
     }
-    grpc_closure_scheduler* scheduler =
-        write_scheduler(t, r.early_results_scheduled, r.partial);
-    if (scheduler != grpc_schedule_on_exec_ctx) {
-      GRPC_STATS_INC_HTTP2_WRITES_OFFLOADED();
-    }
-    set_write_state(
-        t,
-        r.partial ? GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE
-                  : GRPC_CHTTP2_WRITE_STATE_WRITING,
-        begin_writing_desc(r.partial, scheduler == grpc_schedule_on_exec_ctx));
-    GRPC_CLOSURE_SCHED(
-        GRPC_CLOSURE_INIT(&t->write_action, write_action, t, scheduler),
-        GRPC_ERROR_NONE);
+    set_write_state(t,
+                    r.partial ? GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE
+                              : GRPC_CHTTP2_WRITE_STATE_WRITING,
+                    begin_writing_desc(r.partial));
+    write_action(t, GRPC_ERROR_NONE);
     if (t->reading_paused_on_pending_induced_frames) {
       GPR_ASSERT(t->num_pending_induced_frames == 0);
       /* We had paused reading, because we had many induced frames (SETTINGS
diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc
index cfc3c8e9a06..fe025668118 100644
--- a/test/cpp/qps/driver.cc
+++ b/test/cpp/qps/driver.cc
@@ -463,6 +463,17 @@ std::unique_ptr<ScenarioResult> RunScenario(
       gpr_log(GPR_ERROR, "Failed WritesDone for client %zu", i);
     }
   }
+  gpr_log(GPR_INFO, "Finishing servers");
+  for (size_t i = 0; i < num_servers; i++) {
+    auto server = &servers[i];
+    if (!server->stream->Write(server_mark)) {
+      gpr_log(GPR_ERROR, "Couldn't write mark to server %zu", i);
+    }
+    if (!server->stream->WritesDone()) {
+      gpr_log(GPR_ERROR, "Failed WritesDone for server %zu", i);
+    }
+  }
+
   for (size_t i = 0; i < num_clients; i++) {
     auto client = &clients[i];
     // Read the client final status
@@ -499,16 +510,6 @@ std::unique_ptr<ScenarioResult> RunScenario(
     rrc->set_count(it->second);
   }
 
-  gpr_log(GPR_INFO, "Finishing servers");
-  for (size_t i = 0; i < num_servers; i++) {
-    auto server = &servers[i];
-    if (!server->stream->Write(server_mark)) {
-      gpr_log(GPR_ERROR, "Couldn't write mark to server %zu", i);
-    }
-    if (!server->stream->WritesDone()) {
-      gpr_log(GPR_ERROR, "Failed WritesDone for server %zu", i);
-    }
-  }
   for (size_t i = 0; i < num_servers; i++) {
     auto server = &servers[i];
     // Read the server final status