Revert "Merge pull request #1 from andrii-/t1"

This reverts commit 06e1855fd0e3cfd73ba6f80c70b566d7912f0530, reversing
changes made to f3e2fa7f770dce5f9aa2c7338784a250751c9683.
Merge pull request #2 from andrii-/rev-t1

Revert "Merge pull request #1 from andrii-/t1"