Revert "rails4 branch"

This reverts commit 92b77ad4deab9996d846ca1562853f95f5004565.