backout c5a7db4d0902 due to failures in create_talos_zips.py