Follows iris!387 (merged) Cc @haidang @jjourdan
This will create a new commit in order to revert the existing changes.
