Removed the single assignment block from constraints

(cherry picked from commit f609bbf79e5076fc03f3fb788ea08ca303f8489c)