diff --git a/gclient.py b/gclient.py
index feb0c7d152..03177c3f02 100755
--- a/gclient.py
+++ b/gclient.py
@@ -2831,9 +2831,7 @@ def CMDgetdep(parser, args):
         'DEPS file %s does not exist.' % options.deps_file)
   with open(options.deps_file) as f:
     contents = f.read()
-  client = GClient.LoadCurrentConfig(options)
-  local_scope = gclient_eval.Exec(contents, options.deps_file,
-                                  builtin_vars=client.get_builtin_vars())
+  local_scope = gclient_eval.Exec(contents, options.deps_file)
 
   for var in options.vars:
     print(gclient_eval.GetVar(local_scope, var))
@@ -2883,9 +2881,7 @@ def CMDsetdep(parser, args):
         'DEPS file %s does not exist.' % options.deps_file)
   with open(options.deps_file) as f:
     contents = f.read()
-  client = GClient.LoadCurrentConfig(options)
-  local_scope = gclient_eval.Exec(contents, options.deps_file,
-                                  builtin_vars=client.get_builtin_vars())
+  local_scope = gclient_eval.Exec(contents, options.deps_file)
 
   for var in options.vars:
     name, _, value = var.partition('=')
diff --git a/tests/gclient_smoketest.py b/tests/gclient_smoketest.py
index ae2bf2827e..ecd31987b9 100755
--- a/tests/gclient_smoketest.py
+++ b/tests/gclient_smoketest.py
@@ -881,7 +881,6 @@ class GClientSmokeGIT(GClientSmokeBase):
     self.assertEqual(out, output_json)
 
   def testSetDep(self):
-    self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     fake_deps = os.path.join(self.root_dir, 'DEPS.fake')
     with open(fake_deps, 'w') as f:
       f.write('\n'.join([
@@ -895,12 +894,6 @@ class GClientSmokeGIT(GClientSmokeBase):
           '  },',
           '  "bar": "url@bar_rev",',
           '}',
-          'hooks = [{',
-          '  "name": "uses_builtin_var",',
-          '  "pattern": ".",',
-          '  "action": ["python", "fake.py",',
-          '             "--with-android={checkout_android}"],',
-          '}]',
       ]))
 
     results = self.gclient([
@@ -923,16 +916,9 @@ class GClientSmokeGIT(GClientSmokeBase):
           '  },',
           '  "bar": "url@new_bar",',
           '}',
-          'hooks = [{',
-          '  "name": "uses_builtin_var",',
-          '  "pattern": ".",',
-          '  "action": ["python", "fake.py",',
-          '             "--with-android={checkout_android}"],',
-          '}]',
     ], contents)
 
   def testGetDep(self):
-    self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     fake_deps = os.path.join(self.root_dir, 'DEPS.fake')
     with open(fake_deps, 'w') as f:
       f.write('\n'.join([
@@ -946,12 +932,6 @@ class GClientSmokeGIT(GClientSmokeBase):
           '  },',
           '  "bar": "url@bar_rev",',
           '}',
-          'hooks = [{',
-          '  "name": "uses_builtin_var",',
-          '  "pattern": ".",',
-          '  "action": ["python", "fake.py",',
-          '             "--with-android={checkout_android}"],',
-          '}]',
       ]))
 
     results = self.gclient([