This fixes #8059.  It now uses the label from the input.