Allow activesupport to be >= 2.3.0