Back out e78a7c6d9601 (bug 965896) for xpcshell orange