Back out b9597187a3d6 (bug 985212) for xpcshell bustage
CLOSED TREE