Removed the single assignment block from constraints

(cherry picked from commit ed9a364ed6fdb596ebaf928da1a789ab2feef97c)