Proposed fix for #18162.