Removed the single assignment block from constraints

(cherry picked from commit ea9902fdfcf276026f3ca9aee8dc18062ece03d9)