From db600b2e9e87863cad6dd5ce262dc1f793bcaeb0 Mon Sep 17 00:00:00 2001
From: Rob Hogan <2590098+robhogan@users.noreply.github.com>
Date: Wed, 9 Jul 2025 17:57:14 +0100
Subject: [PATCH] [LOCAL] Backout #46896 - Attempt to fix #50274 (#52515)

---
 .../main/java/com/facebook/react/ReactInstanceManager.java    | 4 ++--
 .../facebook/react/uimanager/NativeViewHierarchyManager.java  | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index fb909b746f8..a1a29733a62 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -1399,14 +1399,14 @@ public class ReactInstanceManager {
             new RuntimeException(
                 "detachRootViewFromInstance called with ReactRootView with invalid id"));
       }
-
-      clearReactRoot(reactRoot);
     } else {
       reactContext
           .getCatalystInstance()
           .getJSModule(AppRegistry.class)
           .unmountApplicationComponentAtRootTag(reactRoot.getRootViewTag());
     }
+
+    clearReactRoot(reactRoot);
   }
 
   @ThreadConfined(UI)
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
index 9f37e762035..4def087b2a5 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
@@ -671,9 +671,6 @@ public class NativeViewHierarchyManager {
     View rootView = mTagsToViews.get(rootViewTag);
     dropView(rootView);
     mRootTags.delete(rootViewTag);
-    if (rootView != null) {
-      rootView.setId(View.NO_ID);
-    }
   }
 
   /**