Revert "some py3 work"

This reverts commit ee59a3651469d628462ff88ffed1b40253139902.