Change where the poll timeout is handled