Backed out changeset 79b198be3e50 (bug 943521) for xpcshell failures.