AFT-646: Revert MR!60007 to fix GN-based b-tagger bug

Temporarily reverting !60007 (merged) which introduced a bug in the GN-based b-taggers.

tagging @calpigia, @ligang, @biliu and @fdibello.