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