The new git repo has a fix for filenames with spaces. Their approach replaces our ten line patch with a four line patch. PR: 286197