ENG-5975: Second crack at fixing the timeouts issue.
Not totally done, but will test with this.