revert #15550
Merge pull request #15883 from thatch45/dunder_kwargs

revert #15550