diff --git a/bb b/bb
index 2882d71926..799d9e8fd4 100755
--- a/bb
+++ b/bb
@@ -4,6 +4,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# See revert instructions in cipd_manifest.txt
+
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
diff --git a/bb.bat b/bb.bat
index b401a49ff9..6d69abde13 100644
--- a/bb.bat
+++ b/bb.bat
@@ -3,5 +3,7 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
+:: See revert instructions in cipd_manifest.txt
+
 call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
 "%~dp0\.cipd_bin\bb.exe" %*
diff --git a/cipd_manifest.txt b/cipd_manifest.txt
index 0a92bc0392..cb69b58ed8 100644
--- a/cipd_manifest.txt
+++ b/cipd_manifest.txt
@@ -2,6 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# This file contains version pins of a few infrastructure tools.
+# If a tool is broken, revert a recent CL touching this file.
+# Note that Chromium has its own depot_tools pin, so if in a rush, revert the
+# depot_tools roll as well: https://chromium-review.googlesource.com/q/project:chromium/src+file:DEPS+depot_tools
+# or just wait for the autoroller to auto-roll your revert to Chromium.
+
 # Pin resolved versions in the repo, to reduce trust in the CIPD backend.
 #
 # Most of these tools are generated via builders at
diff --git a/crosjobs b/crosjobs
index c6a46d95b9..6e63932579 100755
--- a/crosjobs
+++ b/crosjobs
@@ -4,6 +4,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# See revert instructions in cipd_manifest.txt
+
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
diff --git a/dirmd b/dirmd
index 1a9b42a699..69097a9757 100755
--- a/dirmd
+++ b/dirmd
@@ -4,6 +4,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# See revert instructions in cipd_manifest.txt
+
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
diff --git a/dirmd.bat b/dirmd.bat
index d6b73c08ec..1798eb0440 100644
--- a/dirmd.bat
+++ b/dirmd.bat
@@ -3,5 +3,7 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
+:: See revert instructions in cipd_manifest.txt
+
 call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
 "%~dp0\.cipd_bin\dirmd.exe" %*
diff --git a/goma_auth b/goma_auth
index 04ffd8d567..ba6b907aa9 100755
--- a/goma_auth
+++ b/goma_auth
@@ -4,6 +4,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# See revert instructions in cipd_manifest.txt
+
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
diff --git a/goma_auth.bat b/goma_auth.bat
index b01bdda325..26dfe960b4 100644
--- a/goma_auth.bat
+++ b/goma_auth.bat
@@ -3,6 +3,8 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
+:: See revert instructions in cipd_manifest.txt
+
 @call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
 @call python.bat %~dp0\.cipd_bin\goma_auth.py %*
 exit /b
diff --git a/goma_ctl b/goma_ctl
index ac27283895..5dd43e4a86 100755
--- a/goma_ctl
+++ b/goma_ctl
@@ -4,6 +4,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# See revert instructions in cipd_manifest.txt
+
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
diff --git a/goma_ctl.bat b/goma_ctl.bat
index 4b572b06f3..8f78190394 100644
--- a/goma_ctl.bat
+++ b/goma_ctl.bat
@@ -3,6 +3,8 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
+:: See revert instructions in cipd_manifest.txt
+
 @call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
 @call vpython.bat %~dp0\.cipd_bin\goma_ctl.py %*
 exit /b
diff --git a/led b/led
index bc71abad5e..a2e30a1f87 100755
--- a/led
+++ b/led
@@ -4,6 +4,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# See revert instructions in cipd_manifest.txt
+
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
diff --git a/led.bat b/led.bat
index 1cbff244d8..72502e2378 100644
--- a/led.bat
+++ b/led.bat
@@ -3,5 +3,7 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
+:: See revert instructions in cipd_manifest.txt
+
 call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
 "%~dp0\.cipd_bin\led.exe" %*
diff --git a/luci-auth b/luci-auth
index 02a7f4f1ea..e2026915d2 100755
--- a/luci-auth
+++ b/luci-auth
@@ -4,6 +4,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# See revert instructions in cipd_manifest.txt
+
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
diff --git a/luci-auth.bat b/luci-auth.bat
index 74b0b67d69..097dbce09a 100644
--- a/luci-auth.bat
+++ b/luci-auth.bat
@@ -3,6 +3,8 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
+:: See revert instructions in cipd_manifest.txt
+
 call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
 "%~dp0\.cipd_bin\luci-auth.exe" %*
 
diff --git a/lucicfg b/lucicfg
index 49e207a33c..75fdf529e5 100755
--- a/lucicfg
+++ b/lucicfg
@@ -4,6 +4,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# See revert instructions in cipd_manifest.txt
+
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
diff --git a/lucicfg.bat b/lucicfg.bat
index 564e384ec8..0269534fb9 100644
--- a/lucicfg.bat
+++ b/lucicfg.bat
@@ -3,5 +3,7 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
+:: See revert instructions in cipd_manifest.txt
+
 call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
 "%~dp0\.cipd_bin\lucicfg.exe" %*
diff --git a/pinpoint b/pinpoint
index 11485d91a6..801017f892 100755
--- a/pinpoint
+++ b/pinpoint
@@ -4,6 +4,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# See revert instructions in cipd_manifest.txt
+
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
diff --git a/pinpoint.bat b/pinpoint.bat
index aed768fbed..4bfd83c1b6 100644
--- a/pinpoint.bat
+++ b/pinpoint.bat
@@ -3,5 +3,7 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
+:: See revert instructions in cipd_manifest.txt
+
 call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
 "%~dp0\.cipd_bin\pinpoint.exe" %*
diff --git a/prpc b/prpc
index 4860810916..94d941bac5 100755
--- a/prpc
+++ b/prpc
@@ -4,6 +4,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# See revert instructions in cipd_manifest.txt
+
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
diff --git a/prpc.bat b/prpc.bat
index 94086d1ae9..71c9d39de3 100644
--- a/prpc.bat
+++ b/prpc.bat
@@ -3,6 +3,8 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
+:: See revert instructions in cipd_manifest.txt
+
 call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
 "%~dp0\.cipd_bin\prpc.exe" %*
 
diff --git a/rdb b/rdb
index 5d36806601..fb6e9747a3 100755
--- a/rdb
+++ b/rdb
@@ -4,6 +4,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# See revert instructions in cipd_manifest.txt
+
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
diff --git a/rdb.bat b/rdb.bat
index 830cdb8545..a7982d0712 100644
--- a/rdb.bat
+++ b/rdb.bat
@@ -3,5 +3,7 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
+:: See revert instructions in cipd_manifest.txt
+
 call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
 "%~dp0\.cipd_bin\rdb.exe" %*
diff --git a/vpython b/vpython
index 63dbf5441e..997658acca 100755
--- a/vpython
+++ b/vpython
@@ -4,6 +4,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# See revert instructions in cipd_manifest.txt
+
 if [[ $VPYTHON_BYPASS == "manually managed python not supported by chrome operations" ]]
 then
   NEWARGS=()
diff --git a/vpython.bat b/vpython.bat
index ca5fe39ba1..0b18261721 100644
--- a/vpython.bat
+++ b/vpython.bat
@@ -3,5 +3,7 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
+:: See revert instructions in cipd_manifest.txt
+
 call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
 "%~dp0\.cipd_bin\vpython.exe" -vpython-interpreter "%~dp0\python.bat" %*