Back out 837203a4e076 (bug 949775) for xpcshell bustage
CLOSED TREE