Backout bcd72aabb661, 1ed1c6212f4c, and 8d6f286139ef (bug 1025998) for xpcshell bustage leading to this CLOSED TREE