Removed the single assignment block from constraints

(cherry picked from commit 7aba4856115abf1aa2c63cd43342a59cde58d023)