ties the countdown and redirect together

they are no longer separate timeouts, nor do they start at
slightly different spots in the code.

The countdown starts at the end, and only once the countdown
reaches 0, does the redirect take place.

fixes #2007