Make constraint unbinding more robust

[Delivers #83698142]