Removed the single assignment block from constraints

(cherry picked from commit e023070a024c364320a47c097046e1da5cd40d92)