Comment # 20 on bug 97980 from Mike Lothian

So I removed your previous patch and applied the new one, I get a panic in
shutdown again