Merge pull request #13479 from Microsoft/10662-fixcontaineragain

Windows: Fix up container again