Revert "further fixes to improve label creation"
Revert "further fixes to improve label creation"

This reverts commit 987d05c835a919cabfcdc9c934f75eac093588c2.

daniel-beet/got-your-back,aign/got-your-back,reinis-martinsons/gyb-frp,aign/got-your-back,daniel-beet/got-your-back