This also avoids hitting the hang at server shutdown.
That hang should be fixed, of course.