Revert "Attempt to avoid activesupport circular depedency error."

This reverts commit e8d6b5365eccb8116924f4953bb770bf7c1c64e5.