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

 Verified by Paul Hargrove