From 6dd41532e593b86fa790dabdd858ca525b74b605 Mon Sep 17 00:00:00 2001
From: Craig Perkins <cwperx@amazon.com>
Date: Tue, 13 Aug 2024 15:00:56 -0400
Subject: [PATCH] Remove extraneous changes

Signed-off-by: Craig Perkins <cwperx@amazon.com>
---
 server/src/main/java/org/opensearch/client/node/NodeClient.java | 2 +-
 .../org/opensearch/common/util/concurrent/ThreadContext.java    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/src/main/java/org/opensearch/client/node/NodeClient.java b/server/src/main/java/org/opensearch/client/node/NodeClient.java
index e7f50e77cb8bb..5780e4c1e648a 100644
--- a/server/src/main/java/org/opensearch/client/node/NodeClient.java
+++ b/server/src/main/java/org/opensearch/client/node/NodeClient.java
@@ -136,7 +136,7 @@ public String getLocalNodeId() {
      * Get the {@link TransportAction} for an {@link ActionType}, throwing exceptions if the action isn't available.
      */
     @SuppressWarnings("unchecked")
-    protected <Request extends ActionRequest, Response extends ActionResponse> TransportAction<Request, Response> transportAction(
+    private <Request extends ActionRequest, Response extends ActionResponse> TransportAction<Request, Response> transportAction(
         ActionType<Response> action
     ) {
         if (actionRegistry == null) {
diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java b/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java
index 95d20d49a74ca..070e18481f2a3 100644
--- a/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java
+++ b/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java
@@ -160,7 +160,6 @@ public StoredContext stashContext() {
          */
 
         ThreadContextStruct threadContextStruct = DEFAULT_CONTEXT.putPersistent(context.persistentHeaders);
-        threadContextStruct.setSystemContext(propagators);
 
         if (context.requestHeaders.containsKey(Task.X_OPAQUE_ID)) {
             threadContextStruct = threadContextStruct.putHeaders(