Backport of gh-32888

Comment From: jhoeller

It turns out that this is not an actual regression on 6.0.x despite the original change having been backported, due to the BridgeMethodResolver algorithm operating differently there.