Revert "havanphi"

This reverts commit 544707572b416dea2b6a70a2cd67a349ab184814.