Fix 10 minute timeouts.

@kuccello please review and merge this PR.