Port a bugfix for the coroutine scheduler

[dkhalanskyjb]

cc1ad3d describes a bug in the coroutine scheduler. We should look at it, write tests confirming the bug, and port the fix.