/cc @romain @tomo
merged
mentioned in commit b7a1b799
This will create a new commit in order to revert the existing changes.