Removed the single assignment block from constraints

(cherry picked from commit 1b19c72422ba58ecf0d6f5d4497044ef20eb7fab)