Issue #22609: Revert changes in UserDict. They conflicted with existing tests.
Issue #22609: Revert changes in UserDict. They conflicted with existing tests.