merged
mentioned in commit 7dad79f8
mentioned in commit 5501838e
This will create a new commit in order to revert the existing changes.