Revert r1245 (the Python3.4 regression was fixed in http://hg.python.org/cpython/rev/b328f8ccbccf).
Revert r1245 (the Python3.4 regression was fixed in http://hg.python.org/cpython/rev/b328f8ccbccf).

hodgestar/genshi,hodgestar/genshi,hodgestar/genshi,hodgestar/genshi