Revert commits

This basically reverts the the change we did in master a while ago and so make it possible again to re-register a Channel.