No longer requires activesupport