Revert "Signed-off-by: Jostein Berntsen <jbernts@broadpark.no>"

This reverts commit 163fabe4f21b92a9828f65ccd186526af6c3b401.