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

This reverts commit ee3f4119fd395f907e4bdf872c4bd1ada4375d19.