Removed the single assignment block from constraints

(cherry picked from commit 7fe29e4da125aedee60ed7bf69cf56cfed5498bd)