This reverts commit 3aa1ea1a, reversing
changes made to 2c12a713.

Conflicts:

	actionpack/lib/action_view/helpers/javascript_helper.rb
	actionpack/lib/action_view/helpers/url_helper.rb
	actionpack/test/template/url_helper_test.rb