hold it until upgrade to rails4
Revert "Merge pull request #1 from linyows/v2.5.3"

This reverts commit 5fd9b1449ca7613534c2c0d309ea6f8367edc43f, reversing
changes made to a32d18a95fe98bf35be74a64d481ea9609003ef4.