reverting r88395 and r88387 as per http://mail.python.org/pipermail/python-dev/2011-February/108005.html