Removed the single assignment block from constraints

(cherry picked from commit 1dae653860c4dc34de62a1198c89bef212ba3e6c)