Revert "Merge branch 'feature' of https://github.com/jagdishrajan/t1 into feature"

This reverts commit 321508a4b09c375c08d71416a056e699c96f8ce7, reversing
changes made to cb30e92e157202c3081e4c4c51579956b8098741.

f5