Removed the single assignment block from constraints

(cherry picked from commit 3a783fe9531c5971dae74fe846747fe16661445d)