Revert "Let's not break original tc"

This reverts commit 6f133f6dc1158e34d163f3c90f94d0971dee5ed6.