On a clean shutdown, let's actually wait and be patient