Partial fix for #13761.