Backed out changesets 4117364f58fb and cb99aff2574e (bug 888373) for xpcshell failures.