Partly revert r23625 (the TIMEOUT_NOBLOCK change), and add a comment explaining why...