diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index 68bb830bc134..ac1a49e953c2 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -260,9 +260,9 @@ step-depot-tools-get: &step-depot-tools-get
       index c305c248..e6e0fbdc 100755
       --- a/gclient.py
       +++ b/gclient.py
-      @@ -735,7 +735,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
- 
-                   if dep_type == 'cipd':
+      @@ -783,7 +783,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
+                               not condition or "non_git_source" not in condition):
+                           continue
                        cipd_root = self.GetCipdRoot()
       -                for package in dep_value.get('packages', []):
       +                packages = dep_value.get('packages', [])
diff --git a/.github/workflows/config/gclient.diff b/.github/workflows/config/gclient.diff
index 3748ed5eec05..4a035b8c991f 100644
--- a/.github/workflows/config/gclient.diff
+++ b/.github/workflows/config/gclient.diff
@@ -2,9 +2,9 @@ diff --git a/gclient.py b/gclient.py
 index 59e2b4c5197928bdba1ef69bdbe637d7dfe471c1..b4bae5e48c83c84bd867187afaf40eed16e69851 100755
 --- a/gclient.py
 +++ b/gclient.py
-@@ -739,7 +739,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
- 
-             if dep_type == 'cipd':
+@@ -783,7 +783,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
+                         not condition or "non_git_source" not in condition):
+                     continue
                  cipd_root = self.GetCipdRoot()
 -                for package in dep_value.get('packages', []):
 +                packages = dep_value.get('packages', [])