Go back to older timeout code