Backed out changeset 03b7efd0dd97 (bug 900541) for mozmill failures.