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