Move to new, underscoreless activesupport dependency