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