Backed out changeset a11f110bd8bb (bug 965217) for mozmill failures.