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

Backport of 7ef81b5cdd4c8eda12aa7786484a0bfde00aaaa4 from master