Revert "Merge branch 'pr/n1420_torarvid'"

To many errors occured.
This reverts commit 30c8392ccdf359fbfb481b61cdc7c47be9d1135b, reversing
changes made to e9fd6af1b2a951f298fd26a7ebc1647e7282a524.