Backed out changeset 93a64959289d (bug 966244) for B2G xpcshell failures.