Backed out changeset 0239a98f60ab (bug 1000851) for xpcshell failures.