Removed the single assignment block from constraints

(cherry picked from commit 0d3754a9294eee3ba4474d8bb3d785f43b7d5d19)