Revert "Discovery: a more lenient wait joinThread when stopping"

This reverts commit 83d9dab79882700fb21cb496282bafdb1d28a5ca.