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