This should not be done here. You cannot simply change the constraint as changes are required for the BC break (see the other PR starting the work)