Revert "moved timeout code"

This reverts commit f8bd3fad8a5e26b68e29392ecb1aafc00422bc36.
fixed qt4 etc