revert r83830, breaks tests on unixes
2 files changed