diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb
index 8513c93ebd..776d9f06f2 100644
--- a/Library/Homebrew/brew.rb
+++ b/Library/Homebrew/brew.rb
@@ -93,7 +93,7 @@ begin
     internal_cmd ||= begin
       internal_dev_cmd = Commands.valid_internal_dev_cmd?(cmd)
       if internal_dev_cmd && !Homebrew::EnvConfig.developer?
-        if ENV["HOMEBREW_DEV_CMD_RUN"].blank? && !Homebrew::EnvConfig.no_dev_cmd_message?
+        if ENV["HOMEBREW_DEV_CMD_RUN"].blank?
           opoo <<~MESSAGE
             #{Tty.bold}#{cmd}#{Tty.reset} is a developer command, so
             Homebrew's developer mode has been automatically turned on.
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index cb2d3d6fe4..312a029742 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -645,7 +645,7 @@ elif [[ -f "${HOMEBREW_LIBRARY}/Homebrew/dev-cmd/${HOMEBREW_COMMAND}.sh" ]]
 then
   if [[ -z "${HOMEBREW_DEVELOPER}" ]]
   then
-    if [[ -z "${HOMEBREW_DEV_CMD_RUN}" ]] && [[ -z "${HOMEBREW_NO_DEV_CMD_MESSAGE}" ]]
+    if [[ -z "${HOMEBREW_DEV_CMD_RUN}" ]]
     then
       message="$(bold "${HOMEBREW_COMMAND}") is a developer command, so
 Homebrew's developer mode has been automatically turned on.
diff --git a/Library/Homebrew/env_config.rb b/Library/Homebrew/env_config.rb
index 91a133899c..1a0aae3a4d 100644
--- a/Library/Homebrew/env_config.rb
+++ b/Library/Homebrew/env_config.rb
@@ -235,10 +235,6 @@ module Homebrew
         description: "If set, disable all use of legacy compatibility code.",
         boolean:     true,
       },
-      HOMEBREW_NO_DEV_CMD_MESSAGE:            {
-        description: "If set, do not display a warning message when running a developer command for the first time.",
-        boolean:     true,
-      },
       HOMEBREW_NO_EMOJI:                      {
         description: "If set, do not print `HOMEBREW_INSTALL_BADGE` on a successful build." \
                      "\n\n    *Note:* Will only try to print emoji on OS X Lion or newer.",
diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
index 9ef36a0175..c5239ebd20 100644
--- a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
+++ b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
@@ -83,6 +83,7 @@ RSpec.shared_context "integration test" do # rubocop:disable RSpec/ContextWordin
       "HOMEBREW_INTEGRATION_TEST" => command_id_from_args(args),
       "HOMEBREW_TEST_TMPDIR"      => TEST_TMPDIR,
       "HOMEBREW_DEVELOPER"        => ENV["HOMEBREW_DEVELOPER"],
+      "HOMEBREW_DEV_CMD_RUN"      => "true",
       "GEM_HOME"                  => nil,
     )
 
diff --git a/docs/Manpage.md b/docs/Manpage.md
index 33e2d586f9..8c87e39086 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -2027,9 +2027,6 @@ example, run `export HOMEBREW_NO_INSECURE_REDIRECT=1` rather than just
 - `HOMEBREW_NO_COMPAT`
   <br>If set, disable all use of legacy compatibility code.
 
-- `HOMEBREW_NO_DEV_CMD_MESSAGE`
-  <br>If set, do not display a warning message when running a developer command for the first time.
-
 - `HOMEBREW_NO_EMOJI`
   <br>If set, do not print `HOMEBREW_INSTALL_BADGE` on a successful build.
 
diff --git a/manpages/brew.1 b/manpages/brew.1
index 082fdbeafe..3aba312e29 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -2923,12 +2923,6 @@ If set, do not print text with colour added\.
 If set, disable all use of legacy compatibility code\.
 .
 .TP
-\fBHOMEBREW_NO_DEV_CMD_MESSAGE\fR
-.
-.br
-If set, do not display a warning message when running a developer command for the first time\.
-.
-.TP
 \fBHOMEBREW_NO_EMOJI\fR
 .
 .br