Backed out changeset 2d7ce67f5874 (bug 940685) for mochitest-bc failures.