[Delivers #84248934] Replace bind/unbind with register/unregister