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