Partially revert 4fe45b8c63 to fix worldserver stuck on "Halting process" on shutdown. Fixes #13201
4fe45b8c63