backout bug 879963 (changesets 4a3befee43f1, 09c9359bdd43, 32ffcd6db605) due to Nightly crashiness, see bug 896200.