Make the add-on extractionless