Revert "BREAKING CHANGE, until refactoring piece is done"

This reverts commit 85c04c273b82a56900a0ecdd24f59223586b34f5.
BREAKING CHANGE, until refactoring piece is done