Revert "T1"

This reverts commit c369e53fe3ced7602ce62e6418afb250f0d93890.