Backed out changeset c609e4ddcff6 (bug 1029648) for B2G XPCShell failures