Correctly cherry pick activesupport/core_ext