ENYO-2403: put back the label fix
ENYO-2403: removed unused method