Reverting as this is only needed on very slow machines, and it didn't
really fix the problem, as it just fails on another line due to a
timeout.

This reverts commit ad830608.