Tests on master are now passing for Rails 4. Please amend commit and remove this change.

Also, for the future, such a huge change that should have been in a separate commit and highlighted in the PR description.