Backout 6e391f971a13 (bug 826439) for xpcshell failures