revert r80932; it breaks windows
2 files changed