diff --git a/scripts/helpers/rebase_and_regenerate_zap.sh b/scripts/helpers/rebase_and_regenerate_zap.sh
index c921d28d46b191..7ba2f829366285 100755
--- a/scripts/helpers/rebase_and_regenerate_zap.sh
+++ b/scripts/helpers/rebase_and_regenerate_zap.sh
@@ -3,76 +3,50 @@
 
 set -e
 
-if [ -z "$PR_NUMBER" ]; then
-    PR_NUMBER=$(jq -r ".pull_request.number" "$GITHUB_EVENT_PATH")
-    if [[ "$PR_NUMBER" == "null" ]]; then
-        PR_NUMBER=$(jq -r ".issue.number" "$GITHUB_EVENT_PATH")
-    fi
-    if [[ "$PR_NUMBER" == "null" ]]; then
-        echo "Failed to determine PR Number."
-        exit 1
-    fi
+PR_NUMBER=$(jq -r ".pull_request.number" "$GITHUB_EVENT_PATH")
+if [[ "$PR_NUMBER" == "null" ]]; then
+	PR_NUMBER=$(jq -r ".issue.number" "$GITHUB_EVENT_PATH")
+fi
+if [[ "$PR_NUMBER" == "null" ]]; then
+	echo "Failed to determine PR Number."
+	exit 1
 fi
-
 echo "Collecting information about PR #$PR_NUMBER of $GITHUB_REPOSITORY..."
 
 if [[ -z "$GITHUB_TOKEN" ]]; then
-    echo "Set the GITHUB_TOKEN env variable."
-    exit 1
+	echo "Set the GITHUB_TOKEN env variable."
+	exit 1
 fi
 
 URI=https://api.github.com
 API_HEADER="Accept: application/vnd.github.v3+json"
 AUTH_HEADER="Authorization: token $GITHUB_TOKEN"
 
-MAX_RETRIES=${MAX_RETRIES:-6}
-RETRY_INTERVAL=${RETRY_INTERVAL:-10}
-REBASEABLE=""
-pr_resp=""
-for ((i = 0; i < "$MAX_RETRIES"; i++)); do
-    pr_resp=$(curl -X GET -s -H "$AUTH_HEADER" -H "$API_HEADER" \
-        "$URI/repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER")
-    REBASEABLE=$(echo "$pr_resp" | jq -r .rebaseable)
-    if [[ "$REBASEABLE" == "null" ]]; then
-        echo "The PR is not ready to rebase, retry after $RETRY_INTERVAL seconds"
-        sleep "$RETRY_INTERVAL"
-        continue
-    else
-        break
-    fi
-done
-
-# if [[ "$REBASEABLE" != "true" ]] ; then
-# 	echo "GitHub doesn't think that the PR is rebaseable!"
-# 	exit 1
-# fi
+pr_resp=$(curl -X GET -s -H "${AUTH_HEADER}" -H "${API_HEADER}" \
+          "${URI}/repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER")
 
 BASE_REPO=$(echo "$pr_resp" | jq -r .base.repo.full_name)
 BASE_BRANCH=$(echo "$pr_resp" | jq -r .base.ref)
 
 USER_LOGIN=$(jq -r ".comment.user.login" "$GITHUB_EVENT_PATH")
 
-if [[ "$USER_LOGIN" == "null" ]]; then
-    USER_LOGIN=$(jq -r ".pull_request.user.login" "$GITHUB_EVENT_PATH")
-fi
-
-user_resp=$(curl -X GET -s -H "$AUTH_HEADER" -H "$API_HEADER" \
-    "$URI/users/$USER_LOGIN")
+user_resp=$(curl -X GET -s -H "${AUTH_HEADER}" -H "${API_HEADER}" \
+            "${URI}/users/${USER_LOGIN}")
 
 USER_NAME=$(echo "$user_resp" | jq -r ".name")
 if [[ "$USER_NAME" == "null" ]]; then
-    USER_NAME=$USER_LOGIN
+	USER_NAME=$USER_LOGIN
 fi
-USER_NAME="$USER_NAME (Rebase PR Action)"
+USER_NAME="${USER_NAME} (Rebase PR Action)"
 
 USER_EMAIL=$(echo "$user_resp" | jq -r ".email")
 if [[ "$USER_EMAIL" == "null" ]]; then
-    USER_EMAIL="$USER_LOGIN@users.noreply.github.com"
+	USER_EMAIL="$USER_LOGIN@users.noreply.github.com"
 fi
 
 if [[ -z "$BASE_BRANCH" ]]; then
-    echo "Cannot get base branch information for PR #$PR_NUMBER!"
-    exit 1
+	echo "Cannot get base branch information for PR #$PR_NUMBER!"
+	exit 1
 fi
 
 HEAD_REPO=$(echo "$pr_resp" | jq -r .head.repo.full_name)
@@ -82,23 +56,23 @@ echo "Base branch for PR #$PR_NUMBER is $BASE_BRANCH"
 
 USER_TOKEN=${USER_LOGIN//-/_}_TOKEN
 UNTRIMMED_COMMITTER_TOKEN=${!USER_TOKEN:-$GITHUB_TOKEN}
-COMMITTER_TOKEN="$(echo -e "$UNTRIMMED_COMMITTER_TOKEN" | tr -d '[:space:]')"
+COMMITTER_TOKEN="$(echo -e "${UNTRIMMED_COMMITTER_TOKEN}" | tr -d '[:space:]')"
 
-git remote set-url origin https://x-access-token:"$COMMITTER_TOKEN@github.com/$GITHUB_REPOSITORY".git
+git remote set-url origin https://x-access-token:$COMMITTER_TOKEN@github.com/$GITHUB_REPOSITORY.git
 git config --global user.email "$USER_EMAIL"
 git config --global user.name "$USER_NAME"
 
-git remote add fork https://x-access-token:"$COMMITTER_TOKEN@github.com/$HEAD_REPO".git
+git remote add fork https://x-access-token:$COMMITTER_TOKEN@github.com/$HEAD_REPO.git
 
 set -o xtrace
 
 # make sure branches are up-to-date
-git fetch origin "$BASE_BRANCH"
-git fetch fork "$HEAD_BRANCH"
+git fetch origin $BASE_BRANCH
+git fetch fork $HEAD_BRANCH
 
 # do the rebase
-git checkout -b fork/"$HEAD_BRANCH" fork/"$HEAD_BRANCH"
-git rebase origin/"$BASE_BRANCH"
+git checkout -b $HEAD_BRANCH fork/$HEAD_BRANCH
+git rebase origin/$BASE_BRANCH
 
 git submodule update --init --recursive third_party/zap/