Backed out changeset 64c58ec763c4 (bug 981280) for mochitest failures.