backout 7c458c70cd5c for suspected talos regression