Fixes #46324

Reverts #45540 and applies #45533 instead, adding a few comments.

I checked manually against the reproducer, but I don't see an easy way to add a non-regression test in the codebase, due to the weird classloader setup this requires (which probably requires Gradle, with a weird setup at that?).