diff --git a/CMakeLists.txt b/CMakeLists.txt
index 986b39e33..e6a3c4bd4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,9 +55,8 @@ set(GPU_COMPUTE_VER "" CACHE STRING
   "Semicolon separated list of compute versions to be built against, e.g. '35;61'")
 ## HIP
 option(USE_HIP  "Build with GPU acceleration" OFF)
-option(USE_RCCL  "Build with RCCL to enable distributed GPU support." OFF)
+option(USE_RCCL "Build with RCCL to enable distributed GPU support." OFF)
 option(BUILD_WITH_SHARED_RCCL "Build with shared RCCL library." OFF)
-option(BUILD_WITH_HIP_CUB "Build with cub in HIP installation" OFF)
 ## Copied From dmlc
 option(USE_HDFS "Build with HDFS support" OFF)
 option(USE_AZURE "Build with AZURE support" OFF)
@@ -188,8 +187,6 @@ if (USE_HIP)
   set(CMAKE_HIP_FLAGS "${CMAKE_HIP_FLAGS} -Wunused-result -w")
   set(CMAKE_HIP_FLAGS "${CMAKE_HIP_FLAGS} -D__HIP_PLATFORM_AMD__")
   add_subdirectory(${PROJECT_SOURCE_DIR}/rocgputreeshap)
-
-  set(BUILD_WITH_HIP_CUB ON)
 endif (USE_HIP)
 
 if (FORCE_COLORED_OUTPUT AND (CMAKE_GENERATOR STREQUAL "Ninja") AND
diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
index 9e9823b86..4dcd1425d 100644
--- a/cmake/Utils.cmake
+++ b/cmake/Utils.cmake
@@ -186,15 +186,9 @@ function(xgboost_set_hip_flags target)
       $<$<AND:$<CONFIG:DEBUG>,$<COMPILE_LANGUAGE:HIP>>:-G>)
   endif (USE_DEVICE_DEBUG)
 
-  if (NOT BUILD_WITH_HIP_CUB)
-    target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_HIP=1 -DTHRUST_IGNORE_CUB_VERSION_CHECK=1)
-    target_include_directories(${target} PRIVATE ${xgboost_SOURCE_DIR}/rocgputreeshap)
-    target_include_directories(${target} PRIVATE ${xgboost_SOURCE_DIR}/warp-primitives/include)
-  else ()
-    target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_HIP=1)
-    target_include_directories(${target} PRIVATE ${xgboost_SOURCE_DIR}/rocgputreeshap)
-    target_include_directories(${target} PRIVATE ${xgboost_SOURCE_DIR}/warp-primitives/include)
-  endif (NOT BUILD_WITH_HIP_CUB)
+  target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_HIP=1)
+  target_include_directories(${target} PRIVATE ${xgboost_SOURCE_DIR}/rocgputreeshap)
+  target_include_directories(${target} PRIVATE ${xgboost_SOURCE_DIR}/warp-primitives/include)
 
   set_target_properties(${target} PROPERTIES
     HIP_STANDARD 17