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