diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f5dab5aa0e27d029777729e7555992cb2b504b69..ea0a57f158cafe047fba57c9f7ce35e0b5217833 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,7 +2,7 @@
 # Uses OWNERS files in different modules throughout the
 # repository as the source of truth for module ownership.
 * @a11r @nicolasnoble @ctiller
-bazel/* @nicolasnoble @a11r @ctiller
+bazel/* @nicolasnoble @dgquintas @ctiller
 cmake/* @jtattermusch @a11r @nicolasnoble @ctiller
 doc/PROTOCOL-HTTP2.md @ejona86 @a11r @nicolasnoble @ctiller
 doc/interop-test-descriptions.md @ejona86 @a11r @nicolasnoble @ctiller
diff --git a/bazel/OWNERS b/bazel/OWNERS
index 40d21e8e0d60b359efcf9ed74795914253b58a5d..8fc7502a915f0acd04d849686a57bc6afadb4689 100644
--- a/bazel/OWNERS
+++ b/bazel/OWNERS
@@ -1,2 +1,5 @@
+set noparent
 @nicolasnoble
+@dgquintas
+@ctiller
 
diff --git a/tools/jenkins/run_bazel_full.sh b/tools/jenkins/run_bazel_full.sh
index edde1bc545146219ca845fa7df55758a7c6057ca..3436a8f8b69e6f0583079e9beae3bc1ea7d9a489 100755
--- a/tools/jenkins/run_bazel_full.sh
+++ b/tools/jenkins/run_bazel_full.sh
@@ -20,6 +20,4 @@ set -ex -o igncr || set -ex
 
 export DOCKERFILE_DIR=tools/dockerfile/test/bazel
 export DOCKER_RUN_SCRIPT=tools/jenkins/run_bazel_full_in_docker.sh
-# Warn PR author if they make a change to the bazel directory
-tools/run_tests/python_utils/check_bazel_dir.py
 exec tools/run_tests/dockerize/build_and_run_docker.sh
diff --git a/tools/run_tests/python_utils/check_bazel_dir.py b/tools/run_tests/python_utils/check_bazel_dir.py
deleted file mode 100755
index 1daf6ee5959ac04097e20afcaedbde97b5172d6f..0000000000000000000000000000000000000000
--- a/tools/run_tests/python_utils/check_bazel_dir.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""This sends out a warning if any changes to the bazel dir are made."""
-
-from __future__ import print_function
-from subprocess import check_output
-
-import comment_on_pr
-import os
-
-_WARNING_MESSAGE = 'WARNING: You are making changes in the Bazel subdirectory. ' \
-                   'Please get explicit approval from @nicolasnoble before merging.'
-
-
-def _get_changed_files(base_branch):
-  """
-  Get list of changed files between current branch and base of target merge branch
-  """
-  # Get file changes between branch and merge-base of specified branch
-  base_commit = check_output(["git", "merge-base", base_branch, "HEAD"]).rstrip()
-  return check_output(["git", "diff", base_commit, "--name-only"]).splitlines()
-
-
-# ghprbTargetBranch environment variable only available during a Jenkins PR tests
-if 'ghprbTargetBranch' in os.environ:
-  changed_files = _get_changed_files('origin/%s' % os.environ['ghprbTargetBranch'])
-  if any(file.startswith('bazel/') for file in changed_files):
-    comment_on_pr.comment_on_pr(_WARNING_MESSAGE)