can we split this into pieces as well? I might need to patch Intl but not templates, etc.