Buck nine fix clean shutdown deadlock

This request was erroneous and has been superseded by #842.