Back out 2865fd5e5458 (bug 967120) for xpcshell and browser-chrome bustage