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