Revert "A correct patch 0f86c164 which was totally brain dead."

This reverts commit 2cfbe5f9ed61bb1cde75765b0611c26b6748c292.
Revert "Ruggedize the poll() wait to avoid early timeouts under heavy loads."

This reverts commit 0f86c16449a4027e49d79c2d5cdeed02b5f04a05.