Revert "latest change: new timeout computing"

This reverts commit 9d42cfe46ac7079175bd41bbb48a3ff494211bb1.