Revert "Made "wait for something to send" behavior more sensible/efficient."

This reverts commit 6bcdc55d22458b6eb79bfccac41abbfe32948ffd.