Revert "30s timeout"

This reverts commit 84d3f9156d8f22045ce70903d2dd7766ae706ac9.