Rebind: don't persist (i.e. overwrite) state until rebind() is complete
Merge pull request #1184 from aledsage/fix/rebind-dont-overwrite-state

Rebind: don't persist (i.e. overwrite) state until rebind() is complete