I kept this here so that when we fix the poll / select issue, we'll also make sure that the timeout thing is settled.