Less broken shutdown