Revert "Revert "t6""

This reverts commit 3cf9aa60da768c455efda7516455ea697adbdb95.