Work around #17962
This fixes #17962 (closed) using the workaround proposed in the ticket. Moreover, we implement the patch that caused #17962 (closed) properly in Hadrian, avoiding the issue there.
This fixes #17962 (closed) using the workaround proposed in the ticket. Moreover, we implement the patch that caused #17962 (closed) properly in Hadrian, avoiding the issue there.