Back out e9795af95ded (bug 1081099) for xpcshell bustage
CLOSED TREE