Revert the timeout code in the oob connection logic as it is causing problems and clearly needs more work.
Merge pull request #119 from rhc54/cmr/fix-oob

Revert the timeout code in the oob connection logic as it is causing problems