Revert "Cleanup checked in six.py file"

This reverts commit 0e3f7c3c72c2be2fd02bdf4df3b2e79203939b4a.