Merge sprockets back into core to prevent double dependency issues