Revert "some big changes"

This reverts commit 859ce9c56d78094138e6be91390c211816b774be.