Backed out changeset 236c33cffbe4 (bug 1037465) for xpcshell bustage