Removed the single assignment block from constraints

(cherry picked from commit da471c059313b2b0872319ebf22f0216e0a2beef)