Back out 8b98e1dc7ef3 (bug 972100) for xpcshell bustage