Removed the single assignment block from constraints

(cherry picked from commit 5bcf72b23192ae476a430b827a0383f884b284f9)