Make constraint unbinding even more robust

[Delivers #83698142]