Backed out changeset 3232989e79e7 (bug 897023) for mochitest-other failures.