Revert 391efc8..6078e27

This rolls back to commit 391efc8cf9941c33c02addf466bdbde3e1afe83d.
Revert 6078e27..9b04954

This rolls back to commit 6078e2709003c7ae8845d8638ac42d9fe4991d72.
Har lagt till varning