[1.7.x] Removed thread customizations of six which are now built-in.

Backport of 7ef81b5cdd from master