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