Make thread pool behave the same as 3.2 and later