Backed out 2 changesets (bug 915757, bug 919885) for xpcshell bustage

Backed out changeset 5d17d90b838d (bug 915757)
Backed out changeset 91495d3a91c8 (bug 919885)