Removed the single assignment block from constraints

(cherry picked from commit 8fa5b01f3bd635afb4c31f9797f7f73a6504c34d)