Revert "Merge branch '3-2-stable' into ps3-2-stable - test out Rails 3.2.15 rc3"

This reverts commit 21b986bb85e57b44902d0bdb8b175ca77f3ff926, reversing
changes made to 83a2c5e0b19ded01f1220cad4d0fbd2be3fee6ad.