Removed the single assignment block from constraints

(cherry picked from commit 0f8feb8cf7e28a2e0bbba84bbe98a6ba2a19f114)