Revert [6086] and [6087] since they caused a major regression with functional tests in 1.2.2. References #7372.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6145 5ecf4fe2-1ee6-0310-87b1-e25e094e27de