Fix Gen 6 tournament problems

Hopefully this fixes Gen 6 tournament problems...

(It's not ideal though, it breaks some backwards compatibility with versions older than 2.29...)