Revert "[Merge] Update from TC1"

This reverts commit c5dbb1897b3ea0c7bf6719bd940557b14406c393.