Prend la suite de !834 (closed). Close #2927 (closed).
This will create a new commit in order to revert the existing changes.
