Revert "use six.u everywhere"

This reverts commit b46edf57c81ff989cabb8adb323c460a89dfc8b7.