Port changes in #24238 to source file
Port changes in #24238 to source file

Microsoft/TypeScript,RyanCavanaugh/TypeScript,minestarks/TypeScript,microsoft/TypeScript,nojvek/TypeScript,SaschaNaz/TypeScript,basarat/TypeScript,weswigham/TypeScript,nojvek/TypeScript,SaschaNaz/TypeScript,microsoft/TypeScript,basarat/TypeScript,donaldpipowitch/TypeScript,alexeagle/TypeScript,minestarks/TypeScript,kitsonk/TypeScript,donaldpipowitch/TypeScript,basarat/TypeScript,Microsoft/TypeScript,weswigham/TypeScript,kpreisser/TypeScript,basarat/TypeScript,kitsonk/TypeScript,nojvek/TypeScript,weswigham/TypeScript,donaldpipowitch/TypeScript,kpreisser/TypeScript,alexeagle/TypeScript,microsoft/TypeScript,minestarks/TypeScript,nojvek/TypeScript,RyanCavanaugh/TypeScript,SaschaNaz/TypeScript,donaldpipowitch/TypeScript,kitsonk/TypeScript,kpreisser/TypeScript,RyanCavanaugh/TypeScript,Microsoft/TypeScript,SaschaNaz/TypeScript,alexeagle/TypeScript