Removed the single assignment block from constraints

(cherry picked from commit 7ddeb71368fc25dc2e9832c8f9b70da9cf08b1ef)