7ec692aa83
restart. Contributed by Jason Lowe and Jim Brennan. (cherry picked from commit ac5f21dbef0f0ad4210e4027f53877760fa606a5)