Backed out changeset ace4dd426349 (bug 972045) for mochitest failures.