Revert "By @Tavousi"

This reverts commit 112cfb780774034e085daac5cec25fe778a482ea.