This reverts commit a25c444b. six 1.9+ requires Python 2.6 so this commit restores Python 2.5 compatibility.