Revert "hadii 2"

This reverts commit c3917797e52c172f46a8b4d4f9d1bf9224d9d911.