merged
mentioned in commit e7606dae
This will create a new commit in order to revert the existing changes.
