diff --git a/.gitignore b/.gitignore
index 31ae18a1f..d26d64709 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@ pin-log.txt
 /chromium/src/
 /google_apis
 /links
+/links.db
+/native_client
 /net
 /out
 /sde-avx-sse-transition-out.txt
diff --git a/chromium/.gclient b/chromium/.gclient
index 5a004a0c0..c1a86ecfe 100644
--- a/chromium/.gclient
+++ b/chromium/.gclient
@@ -5,7 +5,6 @@ solutions = [{
   'managed': False,
   'custom_deps': {
     # Skip syncing some large dependencies Libyuv will never need.
-    'src/native_client': None,
     'src/third_party/cld_2/src': None,
     'src/third_party/ffmpeg': None,
     'src/third_party/hunspell_dictionaries': None,
diff --git a/setup_links.py b/setup_links.py
index 8a131b4f2..947bf2a8d 100755
--- a/setup_links.py
+++ b/setup_links.py
@@ -35,6 +35,7 @@ DIRECTORIES = [
   'build',
   'buildtools',
   'google_apis',  # Needed by build/common.gypi.
+  'native_client',
   'net',
   'testing',
   'third_party/binutils',
diff --git a/sync_chromium.py b/sync_chromium.py
index 53341a78a..4e51b6bd6 100755
--- a/sync_chromium.py
+++ b/sync_chromium.py
@@ -86,8 +86,6 @@ def main():
   env = os.environ.copy()
 
   # Avoid downloading NaCl toolchain as part of the Chromium hooks.
-  env.setdefault('GYP_DEFINES', '')
-  env['GYP_DEFINES'] += ' disable_nacl=1'
   env['GYP_CHROMIUM_NO_ACTION'] = '1'
   gclient_cmd = 'gclient.bat' if sys.platform.startswith('win') else 'gclient'
   args = [