Removed the single assignment block from constraints

(cherry picked from commit b4422c3e7ad671a82b271c8e2d18cd6f97c7dad5)