Revert "Merge regaw-leinad changes to repo"

This reverts commit a26e38cad018e1c072afc5deb4fab6508a6f52ba.