Revert "potential fix for issues caused by timeout implementation"

This reverts commit 62b9b4bb78ffa14d2fdb732728612d47009c8dea.