Revert "deleted unused timeout methods"
Revert "deleted unused timeout methods"

This reverts commit 1850059ddc871aad466851f9733bb402f995a36a.

Mostafa-Samir/klyng,Mostafa-Samir/klyng,Mostafa-Samir/klyng