Removed the single assignment block from constraints

(cherry picked from commit dccd8f165351f26ef0a3ed2e90d564967e08f681)