Backed out changeset cc1bac015920 (bug 966560) for xpcshell failures.