Revert "0 timeout"

This reverts commit 9c66f825e3584e5da85239e821accfc727af21f6.