Removed the single assignment block from constraints

(cherry picked from commit 7ab174e91c82153678c1e6c33e590be8b695d110)