Revert "Merge branch 'upgrades' into rails_3.2"

This reverts commit d40667ef79b2c196f7622ea521af68ff4d28453f, reversing
changes made to d7f819fcc045f19e3337303d34664f449bb2f4ee.