These parameters are so important that it's worthwhile to be more explicit about their interaction. Fixes: #24392