Revert "Merge pull request #22844 from lodr/bug-1043662-missing-labels"

This reverts commit d889984833025f208cfd3f3c2c37c87940a529dc, reversing
changes made to 8b1b64ca3347e015d7a57df6d053f95cd26046ca.