Backed out changeset f169a340dd89 (bug 975816) for mozmill failures.