revert

We have removed the earlier changes done. You can merge it for working on librehatti meanwhile.