revert commit breaking on Rails 4 for now