Backed out r65073, pending fixing it in Windows.
7 files changed