revert r85003, poorly considered; breaks tests
2 files changed