Fixup for #3265