[Python-checkins] cpython (2.7): Backout duplicate changeset ed34ca4e639c