Backed out 2 changesets (bug 987816) for xpcshell orange

Backed out changeset 245d0cb5a7b3 (bug 987816)
Backed out changeset b714220dd39d (bug 987816)