Second level retries breaks timeout message handling, fixes #1020