Backed out r65069, pending fixing it in Windows.
8 files changed