Backed out changeset 13bea55207f2 (bug 952997) for xpcshell orange.