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