Could you check whether it solves the problem?

(Tested on x86_64, no regressions AFAICS.)

Ludo’.