Make delete and unbind idempotent.
Merged bug25716 into default