Changes for new Rails 3.2.11.