New version fixing the broken commit (that was revert).
/cc @jerome
This will create a new commit in order to revert the existing changes.
