From ea9973b86693a58a417302e0ef0eb5bc39fc8c76 Mon Sep 17 00:00:00 2001
From: TheBurchLog <5104941+TheBurchLog@users.noreply.github.com>
Date: Fri, 26 Jan 2024 09:29:23 -0500
Subject: [PATCH] Revert "Fixed self targeting no parent bug"

---
 CHANGELOG.rst                  | 2 --
 brewtils/rest/system_client.py | 5 +----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a7ea6320..d16fd4f4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,8 +6,6 @@ Brewtils Changelog
 TBD
 
 - Fixed self reference bug that was returning back output instead of Request object.
-- Fixed self reference bug, when SystemClient calls itself but doesn't have a current request it 
-  now sends it to Beer Garden instead of attempting to process it locally. 
 
 3.23.0
 ------
diff --git a/brewtils/rest/system_client.py b/brewtils/rest/system_client.py
index 561fda82..d41cd78b 100644
--- a/brewtils/rest/system_client.py
+++ b/brewtils/rest/system_client.py
@@ -424,10 +424,7 @@ def send_bg_request(self, *args, **kwargs):
 
         # If not blocking just return the future
         if not blocking:
-            # TODO: Investigate if self targeting requests with no parents can be processed locally
-            if not self.target_self or not getattr(
-                brewtils.plugin.request_context, "current_request", None
-            ):
+            if not self.target_self:
                 return self._thread_pool.submit(
                     self._wait_for_request, request, raise_on_error, timeout
                 )