Close #938 - re add our register channel manipulation