Implemented "last mile" of unbind v2

[Finishes #54135393]