This reverts commit ea2c5fa8.

Conflicts:

	railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb
	railties/test/generators/app_generator_test.rb