Adapted for more tolerant reinstall