follow up fix for #14837 /cc @hnrch02