Don't bundle it into core directly - add it as a plugin.