This reverts commit 9406d43138811ac4dfd0ab31434f65a649bc882e.
I messed up a test, and when I got it right it was failing. The changed logic
doesn't work quite right (now the async callback called at sync time is
forcing us to stop. I need to be a little more careful about that.