Backed out changeset 1f21bc9fc654 (bug 968793) for B2G xpcshell failures.