Remove requirement to core_ext