From 72f1b18501c00e6868b73993813f2ad8b2473b60 Mon Sep 17 00:00:00 2001
From: Curt Bushko <cbushko@gmail.com>
Date: Fri, 6 Oct 2023 16:44:13 -0400
Subject: [PATCH] revert backport assistant changes

---
 .github/workflows/backport.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index fec6b9e79c..2b26c2371e 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -20,8 +20,4 @@ jobs:
         env:
           BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+\\.x)"
           BACKPORT_TARGET_TEMPLATE: "release/{{.target}}"
-          # This forces the backport assistant to backport the merged commit
-          # instead of each commit individually. The environment variable
-          # just needs to exist for this to happen.
-          BACKPORT_MERGE_COMMIT: true
           GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }}