diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 53d738cbe82..a503557d692 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -2108,8 +2108,7 @@ bool GitClient::synchronousApplyPatch(const FilePath &workingDirectory,
 Environment GitClient::processEnvironment() const
 {
     Environment environment = VcsBaseClientImpl::processEnvironment();
-    const FilePath gitPath = settings().path();
-    environment.prependOrSetPath(gitPath);
+    environment.prependOrSetPath(settings().path());
     if (HostOsInfo::isWindowsHost() && settings().winSetHomeEnvironment()) {
         QString homePath;
         if (qtcEnvironmentVariableIsEmpty("HOMESHARE")) {
diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp
index b0cedb300c7..62ef1f15eb2 100644
--- a/src/plugins/git/gitsettings.cpp
+++ b/src/plugins/git/gitsettings.cpp
@@ -160,7 +160,7 @@ FilePath GitSettings::gitExecutable(bool *ok, QString *errorMessage) const
     if (tryResolve) {
         resolvedBinPath = binaryPath();
         if (!resolvedBinPath.isAbsolutePath())
-            resolvedBinPath = resolvedBinPath.searchInPath({path()}, FilePath::PrependToPath);
+            resolvedBinPath = resolvedBinPath.searchInPath(searchPathList(), FilePath::PrependToPath);
         tryResolve = false;
     }
 
@@ -169,7 +169,7 @@ FilePath GitSettings::gitExecutable(bool *ok, QString *errorMessage) const
             *ok = false;
         if (errorMessage)
             *errorMessage = Tr::tr("The binary \"%1\" could not be located in the path \"%2\"")
-                .arg(binaryPath().toUserOutput(), path().toUserOutput());
+                .arg(binaryPath().toUserOutput(), path());
     }
     return resolvedBinPath;
 }
diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.cpp b/src/plugins/vcsbase/vcsbaseclientsettings.cpp
index e9e6d86136f..33d9b34a6c1 100644
--- a/src/plugins/vcsbase/vcsbaseclientsettings.cpp
+++ b/src/plugins/vcsbase/vcsbaseclientsettings.cpp
@@ -39,7 +39,7 @@ VcsBaseSettings::~VcsBaseSettings() = default;
 FilePaths VcsBaseSettings::searchPathList() const
 {
     // FIXME: Filepathify
-    return Utils::transform(path.value().split(HostOsInfo::pathListSeparator(), Qt::SkipEmptyParts),
+    return Utils::transform(path().split(HostOsInfo::pathListSeparator(), Qt::SkipEmptyParts),
                             &FilePath::fromUserInput);
 }
 
diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.h b/src/plugins/vcsbase/vcsbaseclientsettings.h
index abf79d35988..e998434910f 100644
--- a/src/plugins/vcsbase/vcsbaseclientsettings.h
+++ b/src/plugins/vcsbase/vcsbaseclientsettings.h
@@ -20,7 +20,7 @@ public:
     Utils::StringAspect userEmail{this};
     Utils::IntegerAspect logCount{this};
     Utils::IntegerAspect timeout{this}; // Seconds
-    Utils::FilePathAspect path{this};
+    Utils::StringAspect path{this};
 
     Utils::FilePaths searchPathList() const;
 };