ENYO-3576: restored trace *exactly* as before ...

... to avoid unnecessary merge conflict with ENYO-3082