3 files changed, 7 insertions, 16 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 37585b8c46..2fb7f29d73 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,4 +1,4 @@
-*   Deprecate `.halt_and_display_warning_on_return_false`.
+*   Deprecate `.halt_callback_chains_on_return_false`.
 
     *Rafael Mendonça França*
 
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 267fa755c6..03e3ce821a 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -80,11 +80,15 @@ module ActiveSupport
   cattr_accessor :test_order # :nodoc:
 
   def self.halt_callback_chains_on_return_false
-    Callbacks.halt_and_display_warning_on_return_false
+    ActiveSupport::Deprecation.warn(<<-MSG.squish)
+      ActiveSupport.halt_callback_chains_on_return_false is deprecated and will be removed in Rails 5.2.
+    MSG
   end
 
   def self.halt_callback_chains_on_return_false=(value)
-    Callbacks.halt_and_display_warning_on_return_false = value
+    ActiveSupport::Deprecation.warn(<<-MSG.squish)
+      ActiveSupport.halt_callback_chains_on_return_false= is deprecated and will be removed in Rails 5.2.
+    MSG
   end
 
   def self.to_time_preserves_timezone
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 480291c346..0bee35135b 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -69,19 +69,6 @@ module ActiveSupport
 
     CALLBACK_FILTER_TYPES = [:before, :after, :around]
 
-    def self.halt_and_display_warning_on_return_false=(value)
-
-      ActiveSupport::Deprecation.warn(<<-MSG.squish)
-        .halt_and_display_warning_on_return_false= is deprecated and will be removed in Rails 5.2.
-      MSG
-    end
-
-    def self.halt_and_display_warning_on_return_false
-      ActiveSupport::Deprecation.warn(<<-MSG.squish)
-        .halt_and_display_warning_on_return_false is deprecated and will be removed in Rails 5.2.
-      MSG
-    end
-
     # Runs the callbacks for the given event.
     #
     # Calls the before and around callbacks in the order they were set, yields