Fix warning that re-appeared due to merge resolution.