diff --git a/opencl/api/opencl/amdocl/cl_context.cpp b/opencl/api/opencl/amdocl/cl_context.cpp
index 741fda9ce7..4ee070b1d6 100644
--- a/opencl/api/opencl/amdocl/cl_context.cpp
+++ b/opencl/api/opencl/amdocl/cl_context.cpp
@@ -186,11 +186,6 @@ RUNTIME_ENTRY_RET(cl_context, clCreateContextFromType, (
         return (cl_context) 0;
     }
 
-    if (device_type & CL_HSA_ENABLED_AMD &&
-        device_type & CL_HSA_DISABLED_AMD) {
-        device_type ^= (CL_HSA_ENABLED_AMD | CL_HSA_DISABLED_AMD);
-    }
-
     // Get the devices of the given type.
     cl_uint num_devices;
     bool offlineDevices =
diff --git a/opencl/api/opencl/amdocl/cl_device.cpp b/opencl/api/opencl/amdocl/cl_device.cpp
index 661c33b5af..f8cee2e775 100644
--- a/opencl/api/opencl/amdocl/cl_device.cpp
+++ b/opencl/api/opencl/amdocl/cl_device.cpp
@@ -200,11 +200,6 @@ RUNTIME_ENTRY(cl_int, clGetDeviceIDs, (
         return CL_INVALID_VALUE;
     }
 
-    if (device_type & CL_HSA_ENABLED_AMD &&
-        device_type & CL_HSA_DISABLED_AMD) {
-        device_type ^= (CL_HSA_ENABLED_AMD | CL_HSA_DISABLED_AMD);
-    }
-
     // Get all available devices
     if (!amd::Device::getDeviceIDs(device_type, num_entries,
             devices, num_devices, false)) {
diff --git a/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h b/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h
index 4ac6e71bae..6a12cd6ea0 100644
--- a/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h
+++ b/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h
@@ -247,12 +247,6 @@ typedef union
 
 
 // <amd_internal>
-/*************
-* cl_amd_hsa *
-**************/
-#define CL_HSA_ENABLED_AMD                          (1ull << 62)
-#define CL_HSA_DISABLED_AMD                         (1ull << 63)
-
 /***************************
 * cl_amd_command_intercept *
 ***************************/
diff --git a/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h b/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h
index 8678ded851..f7032f88a2 100644
--- a/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h
+++ b/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h
@@ -210,12 +210,6 @@ typedef union
 
 #define CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD            1
 
-/*************
-* cl_amd_hsa *
-**************/
-#define CL_HSA_ENABLED_AMD                          (1ull << 62)
-#define CL_HSA_DISABLED_AMD                         (1ull << 63)
-
 // <amd_internal>
 /***************************
 * cl_amd_command_intercept *
diff --git a/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h b/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h
index 76da26ed8a..cd9f3906d5 100644
--- a/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h
+++ b/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h
@@ -209,12 +209,6 @@ typedef union
 
 #define CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD            1
 
-/*************
-* cl_amd_hsa *
-**************/
-#define CL_HSA_ENABLED_AMD                          (1ull << 62)
-#define CL_HSA_DISABLED_AMD                         (1ull << 63)
-
 // <amd_internal>
 /***************************
 * cl_amd_command_intercept *