Revert "Merge pull request #528 from benrudolph/task-queue"

This reverts commit e0a0b37a8224f49cd9c1c8598ed8d8ab90d21426, reversing
changes made to 2904b8745c7ccf3b54069a8eeff80388b3f9fccc.