Add back destroy fix unassign

I am not sure when `ui`'ll be merged. This bug fix can be fixed sooner. It's about 7 lines to backport. What I've send and the `#destroy` method removal.