Back out 377f51d0e354 (bug 938108) for crashtest shutdown crashes