PR #16834 makes the task faster but it doesn't work any more!
Reverting to the slower but correct task for now.