This fixes #8067.  The control channels now use the input labels.