Removed the single assignment block from constraints

(cherry picked from commit 092336cf1dba3aae4311618eb2e37e4d2ba91a16)