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