Revert "Merge branch 'master' into moufida-chariet"

This reverts commit 83d604e4218d2364deb8158b357c7b96704a0d1a, reversing
changes made to 8bf002544c3b6e1286301872d3d7d77cdb153c57.