Partially revert changeset #281857369a78 to make sure threads are
reaped in all situations.
1 file changed