Ensure compatibility with Rails 4.1+