Put back the separate-task code removed in 96306df