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