Removed the single assignment block from constraints

(cherry picked from commit 9d28b40bf6c9988a4f05cfbaed9d3426af42824c)