Refs #14827; cleanup after broken merge