Activesupport fallback

Resubmitting PR to 2-7-stable.