Revert "Improved Maatra"

This reverts commit 472ae7bd1f29a92ff43fe68ddd506a4e2056efeb.