Revert "Handle non-existant ids in unbinds properly."

This reverts commit 8ee21d307cd9e3ed8df4467ddf8c21104baed115.
Refactored in preparation for remote connections.