Revert "Attempt to fix test suite on python2.6."
This reverts commit 3b0ed1f9b2d85dc46cae3470978407c2187f189b.