THis fixes #8108.  I just extended the timeout to 60 from 30.