Revert "Use longer timeout."
Revert "Use longer timeout."

This reverts commit ea4ec5f0b87ffc0557330042a8d52b9ea3c4b1c5.

StackStorm/st2,Plexxi/st2,Plexxi/st2,StackStorm/st2,nzlosh/st2,StackStorm/st2,Plexxi/st2,StackStorm/st2,Plexxi/st2,nzlosh/st2,nzlosh/st2,nzlosh/st2