With #583 we now have access to, I believe, the old method of graceful shutdown. Merging this PR now, let's ensure we get this re-added today.
