Revert "Do not blow up if Server.Stop is called twice"

this is very tricky to merge.

This reverts commit f3108bd3d810e2fcf94e21f295fdea82796e513e.