Revert "Merge branch 'feature/testing-merge-and-revert'"

This reverts commit f857449bbdb003623ec52fdf24a464094e70dc0a, reversing
changes made to 7c1dc416638d96687915890db7ad592a7b5bab40.

I shouldn't merged the feature branch yet. It wasn't finished!