This is the real fix for infinite-wait on send() problem that was attempted
in commit 2cddddce, but caused other issues. Thanks Deuce.