This reverts commit 794bb06d.

The reverted change might be what makes try_for() sometimes fail to
notice when it should time out, resulting in crazy things like:

    try_for: attempt 288 (3586.91s elapsed of 300s)...

where Jenkins will abort the test due to inactivity.