Revert "Revert "t1""

This reverts commit 7bc115eae699e6f048ce8cbf1032e945f452a928.