revert last 2 commits, I found a better way

This reverts commit 12baeeed5c627f5f380d2f9d1e41b9e288380479.
This reverts commit 3e26b8c660a4d121a7a81865936ae40cac873e56.