diff --git a/git/util.py b/git/util.py
@@ -219,7 +219,9 @@ def handler(function: Callable, path: PathLike, _excinfo: Any) -> None:
                raise SkipTest(f"FIXME: fails with: PermissionError\n  {ex}") from ex
            raise

-    if sys.version_info >= (3, 12):
        shutil.rmtree(path, onexc=handler)
    else:
        shutil.rmtree(path, onerror=handler)

diff --git a/test/test_util.py b/test/test_util.py
@@ -109,31 +109,66 @@ def test_deletes_dir_with_readonly_files(self, tmp_path):
        sys.platform == "cygwin",
        reason="Cygwin can't set the permissions that make the test meaningful.",
    )
-    def test_wraps_perm_error_if_enabled(self, mocker, permission_error_tmpdir):
-        """rmtree wraps PermissionError when HIDE_WINDOWS_KNOWN_ERRORS is true."""
        # Access the module through sys.modules so it is unambiguous which module's
        # attribute we patch: the original git.util, not git.index.util even though
        # git.index.util "replaces" git.util and is what "import git.util" gives us.
-        mocker.patch.object(sys.modules["git.util"], "HIDE_WINDOWS_KNOWN_ERRORS", True)

-        # Disable common chmod functions so the callback can never fix the problem.
        mocker.patch.object(os, "chmod")
        mocker.patch.object(pathlib.Path, "chmod")

-        # Now we can see how an intractable PermissionError is treated.
        with pytest.raises(SkipTest):
            rmtree(permission_error_tmpdir)

    @pytest.mark.skipif(
        sys.platform == "cygwin",
        reason="Cygwin can't set the permissions that make the test meaningful.",
    )
-    def test_does_not_wrap_perm_error_unless_enabled(self, mocker, permission_error_tmpdir):
-        """rmtree does not wrap PermissionError when HIDE_WINDOWS_KNOWN_ERRORS is false."""
-        # See comments in test_wraps_perm_error_if_enabled for details about patching.
-        mocker.patch.object(sys.modules["git.util"], "HIDE_WINDOWS_KNOWN_ERRORS", False)
-        mocker.patch.object(os, "chmod")
-        mocker.patch.object(pathlib.Path, "chmod")

        with pytest.raises(PermissionError):
            try:
@@ -144,11 +179,7 @@ def test_does_not_wrap_perm_error_unless_enabled(self, mocker, permission_error_
    @pytest.mark.parametrize("hide_windows_known_errors", [False, True])
    def test_does_not_wrap_other_errors(self, tmp_path, mocker, hide_windows_known_errors):
        file_not_found_tmpdir = tmp_path / "testdir"  # It is deliberately never created.
-
-        # See comments in test_wraps_perm_error_if_enabled for details about patching.
-        mocker.patch.object(sys.modules["git.util"], "HIDE_WINDOWS_KNOWN_ERRORS", hide_windows_known_errors)
-        mocker.patch.object(os, "chmod")
-        mocker.patch.object(pathlib.Path, "chmod")

        with pytest.raises(FileNotFoundError):
            try: