diff --git a/recipes/recipe_modules/bot_update/examples/full.py b/recipes/recipe_modules/bot_update/examples/full.py
index ef4cc55c1..01a2c1581 100644
--- a/recipes/recipe_modules/bot_update/examples/full.py
+++ b/recipes/recipe_modules/bot_update/examples/full.py
@@ -34,11 +34,6 @@ def RunSteps(api):
     api.gclient.c.got_revision_reverse_mapping['got_v8_revision'] = 'src/v8'
     api.gclient.c.got_revision_reverse_mapping['got_angle_revision'] = (
         'src/third_party/angle')
-  api.gclient.c.patch_projects['v8'] = ('src/v8', 'HEAD')
-  api.gclient.c.patch_projects['v8/v8'] = ('src/v8', 'HEAD')
-  api.gclient.c.patch_projects['angle/angle'] = ('src/third_party/angle',
-                                                 'HEAD')
-  api.gclient.c.patch_projects['webrtc'] = ('src/third_party/webrtc', 'HEAD')
   api.gclient.c.repo_path_map.update({
       'https://chromium.googlesource.com/angle/angle': (
           'src/third_party/angle', 'HEAD'),
diff --git a/recipes/recipe_modules/gclient/config.py b/recipes/recipe_modules/gclient/config.py
index 028b8de8d..c383d695a 100644
--- a/recipes/recipe_modules/gclient/config.py
+++ b/recipes/recipe_modules/gclient/config.py
@@ -68,22 +68,22 @@ def BaseConfig(USE_MIRROR=True, CACHE_DIR=None,
     parent_got_revision_mapping = Dict(hidden=True),
     delete_unversioned_trees = Single(bool, empty_val=True, required=False),
 
-    # Maps patch_project to (solution/path, revision).
+    # Maps canonical repo URL to (local_path, revision).
+    #  - canonical gitiles repo URL is "https://<host>/<project>"
+    #    where project does not have "/a/" prefix or ".git" suffix.
     #  - solution/path is then used to apply patches as patch root in
     #    bot_update.
     #  - if revision is given, it's passed verbatim to bot_update for
-    #    corresponding dependency. Otherwise (ie None), the patch will be
+    #    corresponding dependency. Otherwise (i.e. None), the patch will be
     #    applied on top of version pinned in DEPS.
-    # This is essentially a whitelist of which projects inside a solution
-    # can be patched automatically by bot_update based on PATCH_PROJECT
-    # property.
-    # For example, bare chromium solution has this entry in patch_projects
-    #     'angle/angle': ('src/third_party/angle', 'HEAD')
+    # This is essentially a whitelist of which repos inside a solution
+    # can be patched automatically by bot_update based on
+    # api.buildbucket.build.input.gerrit_changes[0].project
+    # For example, if bare chromium solution has this entry in repo_path_map
+    #     'https://chromium.googlesource.com/angle/angle': (
+    #       'src/third_party/angle', 'HEAD')
     # then a patch to Angle project can be applied to a chromium src's
     # checkout after first updating Angle's repo to its master's HEAD.
-    # TODO(nodir): remove patch_projects in favor of repo_path_map.
-    patch_projects = Dict(value_type=tuple, hidden=True),
-    # Same as the above, except the keys are full repo URLs.
     repo_path_map = Dict(value_type=tuple, hidden=True),
 
     # Check out refs/branch-heads.
@@ -294,12 +294,6 @@ def infra(c):
   soln.name = 'infra'
   soln.url = 'https://chromium.googlesource.com/infra/infra.git'
   c.got_revision_mapping['infra'] = 'got_revision'
-
-  p = c.patch_projects
-  p['infra/luci/luci-py'] = ('infra/luci', 'HEAD')
-  # TODO(phajdan.jr): remove recipes-py when it's not used for project name.
-  p['infra/luci/recipes-py'] = ('infra/recipes-py', 'HEAD')
-  p['recipe_engine'] = ('infra/recipes-py', 'HEAD')
   c.repo_path_map.update({
       'https://chromium.googlesource.com/infra/luci/gae': (
           'infra/go/src/go.chromium.org/gae', 'HEAD'),
diff --git a/recipes/recipe_modules/gclient/tests/patch_project.py b/recipes/recipe_modules/gclient/tests/patch_project.py
index 2d033f668..047a641f0 100644
--- a/recipes/recipe_modules/gclient/tests/patch_project.py
+++ b/recipes/recipe_modules/gclient/tests/patch_project.py
@@ -24,8 +24,6 @@ def RunSteps(api, patch_project, patch_repository_url):
   soln = src_cfg.solutions.add()
   soln.name = 'src'
   soln.url = 'https://chromium.googlesource.com/chromium/src.git'
-  src_cfg.patch_projects['v8'] = ('src/v8', 'HEAD')
-  src_cfg.patch_projects['v8/v8'] = ('src/v8', 'HEAD')
   src_cfg.repo_path_map.update({
       'https://chromium.googlesource.com/src': ('src', 'HEAD'),
       'https://chromium.googlesource.com/v8/v8': ('src/v8', 'HEAD'),