Removed the single assignment block from constraints

(cherry picked from commit 86d417a788c012a23e64d4abe37ce873c59e436b)