Reapply #1951 and #1960 after bad merge#1964

jakebailey merged 2 commits intomainmicrosoft/typescript-go:mainfrom

jabaile/fix-bad-mergemicrosoft/typescript-go:jabaile/fix-bad-mergeCopy head branch name to clipboard