Backed out changesets 9906961b21af and b2b20bc6576a (bug 946178) because they didn't prevent the crashes. DONTBUILD CLOSED TREE