1 files changed, 8 insertions, 9 deletions
diff --git a/railties/lib/rails/initializer.rb b/railties/lib/rails/initializer.rb
index f6aca082e8..382838f831 100644
--- a/railties/lib/rails/initializer.rb
+++ b/railties/lib/rails/initializer.rb
@@ -90,7 +90,6 @@ module Rails
 
       def run(initializer = nil)
         Rails.configuration = Base.config = @config
-        Rails.application = nil
 
         if initializer
           run_initializer(initializer)
@@ -98,7 +97,14 @@ module Rails
           @initializers.each {|block| run_initializer(block) }
         end
 
-        Rails.application
+        # HAX
+        # TODO: remove hax
+        unless initializer
+          app = Rails::Application.new
+          app.config = @config
+
+          Rails.application = app
+        end
       end
     end
 
@@ -605,11 +611,4 @@ Run `rake gems:install` to install the missing gems.
       Rails::Generators.options.deep_merge! config.generators.options
     end
   end
-
-  Initializer.default.add :build_application do
-    if configuration.frameworks.include?(:action_controller)
-      Rails.application = Rails::Application.new
-      Rails.application.middleware = configuration.middleware
-    end
-  end
 end