Revert "Implement Thomas' timeout tweak"

This reverts commit 0321ea23e057f00fb00870c94457b312684c0e11.