Draft: ATR-28329: Revert MR64018

Revert !64018 (merged) as it caused difference on DL1dv01 b-tagger.
See details of discussion here: !64018 (comment 7391147)

cc @dguest, @fdibello, @ligang.