Back out part of bug 950745 for crashes