rollback the merge of r74524 because it causes failures in test_multiprocessing
2 files changed