diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 6dc35b8e6165..b3dd739cf36c 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -369,13 +369,6 @@ buildPythonPackage rec {
     substituteInPlace third_party/kineto/libkineto/CMakeLists.txt \
       --replace-fail "\''$ENV{ROCM_SOURCE_DIR}" "${rocmtoolkit_joined}"
 
-    # Workaround cmake error //include does not exist! in rocm-core-config.cmake
-    # Removing the call falls back to hip_version. Can likely be removed after ROCm 6.4 bump
-    substituteInPlace cmake/public/LoadHIP.cmake \
-      --replace-fail \
-        "find_package(rocm-core CONFIG)" \
-        ""
-
     # Use composable kernel as dependency, rather than built-in third-party
     substituteInPlace aten/src/ATen/CMakeLists.txt \
       --replace-fail "list(APPEND ATen_HIP_INCLUDE \''${CMAKE_CURRENT_SOURCE_DIR}/../../../third_party/composable_kernel/include)" "" \
diff --git a/pkgs/development/rocm-modules/6/rocm-core/default.nix b/pkgs/development/rocm-modules/6/rocm-core/default.nix
index 08bf9e53fe34..8f5100ec0000 100644
--- a/pkgs/development/rocm-modules/6/rocm-core/default.nix
+++ b/pkgs/development/rocm-modules/6/rocm-core/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Test that the CMake config file can be included and sets expected vars
     ''
       mkdir test_project
-      cd test_project
+      pushd test_project
 
       echo '
         cmake_minimum_required(VERSION 3.16)
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
       ' > CMakeLists.txt
 
       CMAKE_PREFIX_PATH="$out" cmake .
-      cd ..
+      popd
 
       . $out/nix-support/setup-hook
       env | grep '^ROCM'