[s2746] Fix build after the latest backports