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