Revert "No need for six"

This reverts commit 4c3e4c4341f031c265fcf81a14497b2e8feedae1.