Revert change that broke tests on python 2.6.