Default-enabled VendorRepair again