Removed the single assignment block from constraints

(cherry picked from commit abbfe22dd66fc20d4c292308d5bd0e612e6ec853)