Revert "Move TC to TCInit callback"

This reverts commit 2b87b81943f61fc50b4cb5ad3c8ad1b1a18e3263.