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

This reverts commit 3ca91860374adefb5821ab70d1a3030883459231.