Backed out changeset 13c1b3a2d135 (bug 880625) for xpcshell failures.