Revert "Pass Thread index as c'tor argument"

Revert commit 5eca42016ba13f8f
to be in sync with master.

No functional change.