Revert "Merge pull request #985 from kyleknap/waiters"

This reverts commit 431b6949e68686378226796cace1cfc866f82613, reversing
changes made to 0a5605e3bcf9372b9f92b3b6eae684df7b16b2eb.