Revert "T1.6"

This reverts commit cefb599a0a13284a4175f9bcdced17177d965051.