Backed out changeset 42a96b98eeec (bug 925871) for Mozmill failures.