bring in line with #24176