Removed the single assignment block from constraints

(cherry picked from commit 4333ab8db2d1b28a36d3ee1bf457851a6bfc3e86)