This reverts commit de489134.

Conflicts:
	railties/lib/rails/railtie/configuration.rb

It added regression. Will be back after the beta