is this still needed if the fix for #21012 is committed?