diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index 9b0d8be13b..88abd53f89 100644
--- a/Library/Homebrew/utils.rb
+++ b/Library/Homebrew/utils.rb
@@ -109,10 +109,12 @@ def odeprecated(method, replacement = nil, disable: false, disable_on: nil, call
 
   if ARGV.homebrew_developer? || disable ||
      Homebrew.raise_deprecation_exceptions?
-    if replacement_message != "There is no replacement."
-      developer_message = message + "Or, even better, submit a PR to fix it!"
-    else
+    if caller_message.match?(HOMEBREW_LIBRARY_PATH/"cmd") ||
+       caller_message.match?(HOMEBREW_LIBRARY_PATH/"dev-cmd") &&
+       replacement_message == "There is no replacement."
       developer_message = message
+    else
+      developer_message = message + "Or, even better, submit a PR to fix it!"
     end
     raise MethodDeprecatedError, developer_message
   elsif !Homebrew.auditing?