Removed the single assignment block from constraints

(cherry picked from commit 1ae4ecbbf38b6fb53b8544e40e84de1828fbe05a)