Back out 79684dc64173 (bug 898936) for 10.7 debug M4 crashes