Backed out changeset 4b3b3f0c6440 (bug 953156) for xpcshell failures