Fix partial commit for #2214