My fix in 11c5e12c6eb3f9cc7d56564b0bf6536e835cafbd for package_index was pretty bad.