diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 7ba67b8540..3d23565ff9 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -2121,9 +2121,7 @@ MSG
           send("#{att}=", value) if respond_to?("#{att}=")
         end
       end
-  end
 
-  Base.class_eval do
     include ActiveRecord::Persistence
     extend ActiveModel::Naming
     extend QueryCache::ClassMethods