see #4436 and #4615
suite de !872 (closed), sur une bonne branche
This will create a new commit in order to revert the existing changes.
