[chore]: enable early-return from revive (#12061)

[chore]: enable early-return from revive (#12061) #24474