Backed out changeset bafe9571f3e8 (bug 839794) for xpcshell failures.