Added MR to discuss better, rather them discuss on the commit itself.
/cc @jerome
This will create a new commit in order to revert the existing changes.
