Small simplification (#11777)