re-add automatic selection of integrated features