Upgrade to Rails 3217