Fix yet another hangover from merge