1 files changed, 7 insertions, 8 deletions
diff --git a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
index 234283e792..22fc7ecf92 100644
--- a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
@@ -1,15 +1,14 @@
 require 'bigdecimal'
 require 'bigdecimal/util'
 
-class BigDecimal
-  DEFAULT_STRING_FORMAT = 'F'
-  alias_method :to_default_s, :to_s
+module ActiveSupport
+  module BigDecimalWithDefaultFormat #:nodoc:
+    DEFAULT_STRING_FORMAT = 'F'
 
-  def to_s(format = nil, options = nil)
-    if format.is_a?(Symbol)
-      to_formatted_s(format, options || {})
-    else
-      to_default_s(format || DEFAULT_STRING_FORMAT)
+    def to_s(format = nil)
+      super(format || DEFAULT_STRING_FORMAT)
     end
   end
 end
+
+BigDecimal.prepend(ActiveSupport::BigDecimalWithDefaultFormat)