Revert "This work feels futile, trying another aproach"

This reverts commit 6baadc1093f5b8d3f0b7a1c99e159e48364aa121.