Revert "merge changes from alyst"

This reverts commit e5e6ed5284676d8a05f775785487d8a3b61b72b3.