backout a566d0ba39d9 (bug 1042238) for crashes