Any particular reason for removing the `timeout`? If not, I'd rather put it back.