diff --git a/gclient.py b/gclient.py
index 21eeeb5a19..4867d261e2 100755
--- a/gclient.py
+++ b/gclient.py
@@ -1736,6 +1736,10 @@ it or fix the checkout.
             # Delete the entry
             print('\n________ deleting \'%s\' in \'%s\'' % (
                 entry_fixed, self.root_dir))
+
+            # TOOO(thestig): Remove after debugging https://crbug.com/823586
+            print('\n________ because \'%s\' is not in: %s' % (
+                scm_root, full_entries))
             gclient_utils.rmtree(e_dir)
       # record the current list of entries for next time
       self._SaveEntries()
diff --git a/tests/gclient_smoketest.py b/tests/gclient_smoketest.py
index 9a66883a0b..270a7329c7 100755
--- a/tests/gclient_smoketest.py
+++ b/tests/gclient_smoketest.py
@@ -123,6 +123,11 @@ class GClientSmokeBase(fake_repos.FakeReposTestBase):
           re.match(r'_____ [^ ]+ : Attempting rebase onto [0-9a-f]+...', line)):
         continue
 
+      # TODO(thestig): Remove after debugging https://crbug.com/823586
+      match = re.match(r'^________ because \'.*\' is not in: \[.*\]$', line)
+      if match:
+        continue
+
       # Fail for any unrecognized lines that start with '__'.
       self.fail(line)
     return results