Issue #20044 Cleanup.