@boegel wouldn't it be good to make a second patch that removes this line. it will be needed with ictce builds anyway