Rework after accidental repo kill.