Revert "Merge branch 'feature/second-merge-rever-test'"

This reverts commit 818eeff152b22f65504884b6ed730efa1572706e, reversing
changes made to 1bb659a71b562f439e739d49a16e10ea4f11eded.

I merged the feature too early