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