Back out 61454adff1d6 (bug 985212) for xpcshell bustage