Revert "Merge remote-tracking branch 'upstream/master' into fr-FR"

This reverts commit 4d5059fad6de24c5c42f45725bc424703ea70328, reversing
changes made to dfb367c1049f18e6f1b717f6fd3cb17ba6328063.