Fix regression to (#8063)