>> > Could you please make such a change?
>>
>> Martin suggested to add the "use the old implementation" option
>> to Emacs 27.2.  Is it OK with you?
>
> Yes, thanks.

Here is the first version of the patch for master.  If generally it's OK,
then it could be backported to Emacs 27.2: