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