Following upstream. Changed timeout from 30 to 60.