Remove direct dependency on six since that doesn't help either.