Changed to work with Rails 4