Revert "Attempting to merge Måtta-devbuild with mine.."

This reverts commit 54f7b75319c078de75f573ffb1a581051232ffed.
Revert "Merge"

This reverts commit c99213ab24e8723f2d1af7d8dcc041bc5e563058.