Revert changes for #13355 by request from Raymond Hettinger
4 files changed