Revert "this is not working for now, pointless then"

This reverts commit 4ca8121c88ad219d7875082eb36d912298a5f232.