diff --git a/runtime/hsa-runtime/core/runtime/amd_topology.cpp b/runtime/hsa-runtime/core/runtime/amd_topology.cpp
index 36d49cf5dd..17b5bc399e 100644
--- a/runtime/hsa-runtime/core/runtime/amd_topology.cpp
+++ b/runtime/hsa-runtime/core/runtime/amd_topology.cpp
@@ -211,11 +211,6 @@ void RegisterLinkInfo(uint32_t node_id, uint32_t num_link) {
         link_info.atomic_support_32bit = true;
         link_info.atomic_support_64bit = true;
         link_info.coherent_support = true;
-        if (core::Runtime::runtime_singleton_->flag().patch_xgmi_link_weight()) {
-          if (io_link.Weight == 0) {
-            io_link.Weight = 15;
-          }
-        }
         break;
       default:
         debug_print("Unrecognized IOLINK type.\n");
@@ -223,16 +218,14 @@ void RegisterLinkInfo(uint32_t node_id, uint32_t num_link) {
     }
 
     // KFD is reporting wrong override status for XGMI.  Disallow override for bringup.
-    if (!core::Runtime::runtime_singleton_->flag().patch_link_override()) {
-      if (io_link.Flags.ui32.Override == 1) {
-        if (io_link.Flags.ui32.NoPeerToPeerDMA == 1) {
-          // Ignore this link since peer to peer is not allowed.
-          continue;
-        }
-        link_info.atomic_support_32bit = (io_link.Flags.ui32.NoAtomics32bit == 0);
-        link_info.atomic_support_64bit = (io_link.Flags.ui32.NoAtomics64bit == 0);
-        link_info.coherent_support = (io_link.Flags.ui32.NonCoherent == 0);
+    if (io_link.Flags.ui32.Override == 1) {
+      if (io_link.Flags.ui32.NoPeerToPeerDMA == 1) {
+        // Ignore this link since peer to peer is not allowed.
+        continue;
       }
+      link_info.atomic_support_32bit = (io_link.Flags.ui32.NoAtomics32bit == 0);
+      link_info.atomic_support_64bit = (io_link.Flags.ui32.NoAtomics64bit == 0);
+      link_info.coherent_support = (io_link.Flags.ui32.NonCoherent == 0);
     }
 
     link_info.max_bandwidth = io_link.MaximumBandwidth;
diff --git a/runtime/hsa-runtime/core/util/flag.h b/runtime/hsa-runtime/core/util/flag.h
index e6825f7f8a..cd57903ead 100644
--- a/runtime/hsa-runtime/core/util/flag.h
+++ b/runtime/hsa-runtime/core/util/flag.h
@@ -111,12 +111,6 @@ class Flag {
     var = os::GetEnvVar("HSA_DISABLE_FRAGMENT_ALLOCATOR");
     disable_fragment_alloc_ = (var == "1") ? true : false;
 
-    var = os::GetEnvVar("HSA_UNPATCH_XGMI_LINK_WEIGHT");
-    patch_xgmi_link_weight_ = (var == "1") ? false : true;
-
-    var = os::GetEnvVar("HSA_UNPATCH_LINK_OVERRIDE");
-    patch_link_override_ = (var == "1") ? false : true;
-
     var = os::GetEnvVar("HSA_ENABLE_SDMA_HDP_FLUSH");
     enable_sdma_hdp_flush_ = (var == "0") ? false : true;
 
@@ -179,11 +173,6 @@ class Flag {
 
   bool disable_fragment_alloc() const { return disable_fragment_alloc_; }
 
-  // Temporary way to control ROCr interpretation of inter-device link weight
-  bool patch_xgmi_link_weight() const { return patch_xgmi_link_weight_; }
-
-  bool patch_link_override() const { return patch_link_override_; }
-
   bool rev_copy_dir() const { return rev_copy_dir_; }
 
   bool fine_grain_pcie() const { return fine_grain_pcie_; }
@@ -242,8 +231,6 @@ class Flag {
   bool disable_image_;
   bool loader_enable_mmap_uri_;
   bool check_sramecc_validity_;
-  bool patch_xgmi_link_weight_;
-  bool patch_link_override_;
   bool debug_;
   bool cu_mask_skip_init_;