Commit 5dabc4d72fdcabca54fa9588d82695331c877fff

Sylvain Becker 2020-12-28T18:17:25

Revert changeset 14590 544ac819e8b3 , does not fully fix