backout 5accb0ac8bfb; needs more discussion on python-dev
2 files changed