Backed out changeset f1abdc201968 (bug 823787) for breaking PGO builds on Windows
Merge m-c to inbound