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

This reverts commit d3c9d87a4fd58c9af15a44eb6c2b6c131f939912.