Remove the hard-dep on six

It looks like it is no longer needed, but leaving it commented
until we do some more tests.
Merge remote-tracking branch 'kali/hotfix/remove-six-hard-dep' into develop