Repair Before You Replace