Back out 34a02ee9896c (bug 1024555) for xpcshell bustage
CLOSED TREE