optimize unbind

R=arv
BUG=

Review URL: https://codereview.appspot.com/13527046