Revert r63378. These files need to stay compatible with Python 2.x (until Python 3.0 is actually used to package Python).