This breaks code that depended on the monitor being fully dead before
c->stop() returns.

This reverts commit 62e04161.