Allow for repatching via --repatch