Now with extra sane-timeout goodness!